aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-05-29 09:18:26 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-30 11:10:33 -0400
commit8cbf74da435d1bd13dbb790f94c7ff67b2fb6af4 (patch)
tree385191c93a87d3c2fe35b62964eb1ed5e1976cb4 /fs
parentb2b80195d8829921506880f6dccd21cabd163d0d (diff)
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.c11
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)
500 * If ref is non-zero, then decrement the refcount too. 500 * If ref is non-zero, then decrement the refcount too.
501 * Returns dentry requiring refcount drop, or NULL if we're done. 501 * Returns dentry requiring refcount drop, or NULL if we're done.
502 */ 502 */
503static struct dentry * 503static struct dentry *dentry_kill(struct dentry *dentry)
504dentry_kill(struct dentry *dentry, int unlock_on_failure)
505 __releases(dentry->d_lock) 504 __releases(dentry->d_lock)
506{ 505{
507 struct inode *inode = dentry->d_inode; 506 struct inode *inode = dentry->d_inode;
@@ -523,10 +522,8 @@ dentry_kill(struct dentry *dentry, int unlock_on_failure)
523 return parent; 522 return parent;
524 523
525failed: 524failed:
526 if (unlock_on_failure) { 525 spin_unlock(&dentry->d_lock);
527 spin_unlock(&dentry->d_lock); 526 cpu_relax();
528 cpu_relax();
529 }
530 return dentry; /* try again with same dentry */ 527 return dentry; /* try again with same dentry */
531} 528}
532 529
@@ -615,7 +612,7 @@ repeat:
615 return; 612 return;
616 613
617kill_it: 614kill_it:
618 dentry = dentry_kill(dentry, 1); 615 dentry = dentry_kill(dentry);
619 if (dentry) 616 if (dentry)
620 goto repeat; 617 goto repeat;
621} 618}