Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2159184e authored by Al Viro's avatar Al Viro
Browse files

d_walk() might skip too much 



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.

Cc: stable@vger.kernel.org # 3.2 and later
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 030bbdbf

fs/dcache.c

+4 −4
Original line number Diff line number Diff line
@@ -1239,13 +1239,13 @@ static void d_walk(struct dentry *parent, void *data, 
		/* might go back up the wrong parent if we have had a rename. */

		if (need_seqretry(&rename_lock, seq))

			goto rename_retry;

		/* go into the first sibling still alive */

		do {

			next = child->d_child.next;

		while (unlikely(child->d_flags & DCACHE_DENTRY_KILLED)) {

			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;

	}