dentry_kill() doesn't need the second argument now
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 29 May 2014 13:18:26 +0000 (09:18 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 30 May 2014 15:10:33 +0000 (11:10 -0400)
it's 1 in the only remaining caller.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/dcache.c

index eb7c7255470cdf8341fe72fb9f63d8e68d759ca3..bce851dc03ef96bd18189796c3bb76c0a29901cf 100644 (file)
@@ -500,8 +500,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;
@@ -523,10 +522,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 */
 }
 
@@ -615,7 +612,7 @@ repeat:
        return;
 
 kill_it:
-       dentry = dentry_kill(dentry, 1);
+       dentry = dentry_kill(dentry);
        if (dentry)
                goto repeat;
 }