diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-28 23:09:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-06 08:19:32 -0700 |
| commit | 85f13d11fa402be59592da99d04ca12b0662dc63 (patch) | |
| tree | 91a6a28ed5f56d5c557a481c99597cbcf01fb9da | |
| parent | 9ad68dc3f6f155f6a8bda0bb8837c854a9db2ff2 (diff) | |
d_walk() might skip too much
commit 2159184ea01e4ae7d15f2017e296d4bc82d5aeb0 upstream.
when we find that a child has died while we'd been trying to ascend,
we should go into the first live sibling itself, rather than its sibling.
Off-by-one in question had been introduced in "deal with deadlock in
d_walk()" and the fix needs to be backported to all branches this one
has been backported to.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/dcache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index a9231c872342..1d7e8a3fb6cd 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1135,13 +1135,13 @@ ascend: /* might go back up the wrong parent if we have had a rename. */ if (need_seqretry(&rename_lock, seq)) goto rename_retry; - next = child->d_child.next; - while (unlikely(child->d_flags & DCACHE_DENTRY_KILLED)) { + /* go into the first sibling still alive */ + do { + next = child->d_child.next; if (next == &this_parent->d_subdirs) goto ascend; child = list_entry(next, struct dentry, d_child); - next = next->next; - } + } while (unlikely(child->d_flags & DCACHE_DENTRY_KILLED)); rcu_read_unlock(); goto resume; } |