Skip to content

Commit

Permalink
dentry_kill() doesn't need the second argument now
Browse files Browse the repository at this point in the history
it's 1 in the only remaining caller.

Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed May 30, 2014
1 parent b2b8019 commit 8cbf74d
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions fs/dcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 */
}

Expand Down Expand Up @@ -615,7 +612,7 @@ void dput(struct dentry *dentry)
return;

kill_it:
dentry = dentry_kill(dentry, 1);
dentry = dentry_kill(dentry);
if (dentry)
goto repeat;
}
Expand Down

0 comments on commit 8cbf74d

Please sign in to comment.