diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-28 09:48:44 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-10-30 22:17:40 +0100 |
| commit | e69a2ca7917a453a4cba8be4e722908c147ed16d (patch) | |
| tree | fb37bd340092906c8002768c7702f554762be5a0 /fs | |
| parent | 72b7f65091199b7ae38ad658c5ce8246f1496976 (diff) | |
lift the "already marked killed" case into shrink_dentry_list()
commit 64fd72e0a44bdd62c5ca277cb24d0d02b2d8e9dc upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dcache.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 4b2cb57d6541..c7085b971290 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -477,12 +477,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: @@ -837,6 +831,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. |