lkml.org 
[lkml]   [2017]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 35/51] ceph: dont update_dentry_lease unless we actually got one
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jeff Layton <jlayton@redhat.com>


    [ Upstream commit 80d025ffede88969f6adf7266fbdedfd5641148a ]

    This if block updates the dentry lease even in the case where
    the MDS didn't grant one.

    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Reviewed-by: Yan, Zheng <zyan@redhat.com>
    Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/ceph/inode.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/fs/ceph/inode.c
    +++ b/fs/ceph/inode.c
    @@ -1323,8 +1323,8 @@ retry_lookup:
    ceph_dir_clear_ordered(dir);
    dout("d_delete %p\n", dn);
    d_delete(dn);
    - } else {
    - if (have_lease && d_unhashed(dn))
    + } else if (have_lease) {
    + if (d_unhashed(dn))
    d_add(dn, NULL);
    update_dentry_lease(dn, rinfo->dlease,
    session,

    \
     
     \ /
      Last update: 2017-10-22 17:26    [W:2.574 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site