lkml.org 
[lkml]   [2015]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 17/64] d_walk() might skip too much
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Al Viro <viro@zeniv.linux.org.uk>

    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>

    ---
    fs/dcache.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- 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;
    }



    \
     
     \ /
      Last update: 2015-06-03 15:21    [W:4.267 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site