aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-05-28 09:48:44 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-28 09:48:44 -0400
commit64fd72e0a44bdd62c5ca277cb24d0d02b2d8e9dc (patch)
tree03260dee00fe5e06cd627cd04990e806992057a9
parentb6dd6f4738837439c520e73995ec93fe1de2ec72 (diff)
downloadlinux-64fd72e0a44bdd62c5ca277cb24d0d02b2d8e9dc.tar.gz
lift the "already marked killed" case into shrink_dentry_list()
It can happen only when dentry_kill() is called with unlock_on_failure equal to 0 - other callers had dentry pinned until the moment they've got ->d_lock and DCACHE_DENTRY_KILLED is set only after lockref_mark_dead(). IOW, only one of three call sites of dentry_kill() might end up reaching that code. Just move it there. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/dcache.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/dcache.c b/fs/dcache.c
index 42ae01eefc0..6888dde4d56 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -455,12 +455,6 @@ dentry_kill(struct dentry *dentry, int unlock_on_failure)
struct dentry *parent = NULL;
bool can_free = true;
- if (unlikely(dentry->d_flags & DCACHE_DENTRY_KILLED)) {
- can_free = dentry->d_flags & DCACHE_MAY_FREE;
- spin_unlock(&dentry->d_lock);
- goto out;
- }
-
inode = dentry->d_inode;
if (inode && !spin_trylock(&inode->i_lock)) {
relock:
@@ -815,6 +809,15 @@ static void shrink_dentry_list(struct list_head *list)
continue;
}
+
+ if (unlikely(dentry->d_flags & DCACHE_DENTRY_KILLED)) {
+ bool can_free = dentry->d_flags & DCACHE_MAY_FREE;
+ spin_unlock(&dentry->d_lock);
+ if (can_free)
+ dentry_free(dentry);
+ continue;
+ }
+
parent = dentry_kill(dentry, 0);
/*
* If dentry_kill returns NULL, we have nothing more to do.