Commit b004c3a7 authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman

dentry_kill() doesn't need the second argument now

commit 8cbf74da upstream.

it's 1 in the only remaining caller.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6179fe37
......@@ -498,8 +498,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;
......@@ -521,10 +520,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 */
}
......@@ -616,7 +613,7 @@ void dput(struct dentry *dentry)
return;
kill_it:
dentry = dentry_kill(dentry, 1);
dentry = dentry_kill(dentry);
if (dentry)
goto repeat;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment