Patch "ceph: don't update_dentry_lease unless we actually got one" has been added to the 4.9-stable tree

Patch "ceph: don't update_dentry_lease unless we actually got one" has been added to the 4.9-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    ceph: don't update_dentry_lease unless we actually got one

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     ceph-don-t-update_dentry_lease-unless-we-actually-got-one.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Thu Oct 19 15:04:02 CEST 2017
From: Jeff Layton <jlayton@redhat.com>
Date: Thu, 26 Jan 2017 16:14:18 -0500
Subject: ceph: don't update_dentry_lease unless we actually got one

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,


Patches currently in stable-queue which might be from jlayton@redhat.com are

queue-4.9/ceph-fix-bogus-endianness-change-in-ceph_ioctl_set_layout.patch
queue-4.9/ceph-clean-up-unsafe-d_parent-accesses-in-build_dentry_path.patch
queue-4.9/ceph-don-t-update_dentry_lease-unless-we-actually-got-one.patch