diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-29 09:18:26 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-30 11:10:33 -0400 |
| commit | 8cbf74da435d1bd13dbb790f94c7ff67b2fb6af4 (patch) | |
| tree | 385191c93a87d3c2fe35b62964eb1ed5e1976cb4 /fs | |
| parent | b2b80195d8829921506880f6dccd21cabd163d0d (diff) | |
| download | linux-stable-8cbf74da435d1bd13dbb790f94c7ff67b2fb6af4.tar.gz linux-stable-8cbf74da435d1bd13dbb790f94c7ff67b2fb6af4.tar.bz2 linux-stable-8cbf74da435d1bd13dbb790f94c7ff67b2fb6af4.zip | |
dentry_kill() doesn't need the second argument now
it's 1 in the only remaining caller.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dcache.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index eb7c7255470c..bce851dc03ef 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -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; } |