diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-29 06:09:19 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-09-18 04:20:43 +0300 |
| commit | 19cc68ff76c1704208ed0913292050531d9188de (patch) | |
| tree | d355e690f81af1abdd1adce912f4459184a0d8dc /fs | |
| parent | b31dfb226bf10b9b9bd58fe5bf0eceaef5d1bfe0 (diff) | |
| download | linux-19cc68ff76c1704208ed0913292050531d9188de.tar.xz | |
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: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'fs')
| -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 8038a780696f..d071ea768057 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1204,13 +1204,13 @@ ascend: /* might go back up the wrong parent if we have had a rename */ if (!locked && read_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; } |