From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757090AbdJKBDa (ORCPT ); Tue, 10 Oct 2017 21:03:30 -0400 Received: from omzsmtpe01.verizonbusiness.com ([199.249.25.210]:59039 "EHLO omzsmtpe01.verizonbusiness.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932723AbdJKAqd (ORCPT ); Tue, 10 Oct 2017 20:46:33 -0400 From: "Levin, Alexander (Sasha Levin)" X-Host: mariner.tdc.vzwcorp.com To: "gregkh@linuxfoundation.org" CC: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [GIT PULL for-4.9 33/48] ceph: don't update_dentry_lease unless we actually got one Thread-Topic: [GIT PULL for-4.9 33/48] ceph: don't update_dentry_lease unless we actually got one Thread-Index: AQHTQio7zq6yeSQYGECCtzFbnfFQOQ== Date: Wed, 11 Oct 2017 00:45:27 +0000 Message-ID: <20171011004512.7949-34-alexander.levin@verizon.com> References: <20171011004512.7949-1-alexander.levin@verizon.com> In-Reply-To: <20171011004512.7949-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id v9B14cAC030515 From: Jeff Layton [ 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 Reviewed-by: Yan, Zheng Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 953275b651bc..4a6df2ce0f76 100644 --- 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, -- 2.11.0