[Devel] [PATCH 09/10] dentry_kill() doesn't need the second argument now

[Vladimir Davydov]

From: Al Viro <viro at zeniv.linux.org.uk>

it's 1 in the only remaining caller.

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
(cherry picked from commit 8cbf74da435d1bd13dbb790f94c7ff67b2fb6af4)
Signed-off-by: Vladimir Davydov <vdavydov at virtuozzo.com>
---
 fs/dcache.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/fs/dcache.c b/fs/dcache.c
index 7b75b482bec2..ab6859764a6a 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -529,8 +529,7 @@ static void __dentry_kill(struct dentry *dentry)
  * If ref is non-zero, then decrement the refcount too.
  * Returns dentry requiring refcount drop, or NULL if we're done.
  */
-static struct dentry *
-dentry_kill(struct dentry *dentry, int unlock_on_failure)
+static struct dentry *dentry_kill(struct dentry *dentry)
 	__releases(dentry->d_lock)
 {
 	struct inode *inode = dentry->d_inode;
@@ -552,10 +551,8 @@ dentry_kill(struct dentry *dentry, int unlock_on_failure)
 	return parent;
 
 failed:
-	if (unlock_on_failure) {
-		spin_unlock(&dentry->d_lock);
-		cpu_relax();
-	}
+	spin_unlock(&dentry->d_lock);
+	cpu_relax();
 	return dentry; /* try again with same dentry */
 }
 
@@ -643,7 +640,7 @@ repeat:
 	return;
 
 kill_it:
-	dentry = dentry_kill(dentry, 1);
+	dentry = dentry_kill(dentry);
 	if (dentry)
 		goto repeat;
 }
-- 
2.1.4