lkml.org 
[lkml]   [2016]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 025/130] lift the "already marked killed" case into shrink_dentry_list()
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

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

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/dcache.c | 15 +++++++++------
    1 file changed, 9 insertions(+), 6 deletions(-)

    --- a/fs/dcache.c
    +++ b/fs/dcache.c
    @@ -453,12 +453,6 @@ dentry_kill(struct dentry *dentry, int u
    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:
    @@ -816,6 +810,15 @@ static void shrink_dentry_list(struct li
    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.

    \
     
     \ /
      Last update: 2016-03-02 03:41    [W:4.102 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site