Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: "Levin, Alexander (Sasha Levin)" Newsgroups: linux.kernel Subject: [PATCH review for 4.9 33/50] ceph: don't update_dentry_lease unless we actually got one Date: Mon, 25 Sep 2017 03:40:02 +0200 Message-ID: References: X-Original-To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506302055; x=1537838055; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=KXttqifCMOvDJZUkozKtsykRYzgxBifc8NPpvLX7ox8=; b=SUAX+1FuPj0Ehc+WCB4i+sVaopaC2HkC404sEw3esA8rzO7ZnGW1cx4P E6F1c5xeSAOwbhj8C6YWuv83Xl4RCkrrorPWxvIXoGtZPTIOyR0a1pxMn EO/+w/eS/n9JBxu2KcXnFd1OqbQJaNR1J0B+2ozczBt3L46mhpfN5kMYh k=; Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506302014; x=1537838014; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=KXttqifCMOvDJZUkozKtsykRYzgxBifc8NPpvLX7ox8=; b=LxbBZb+rcSHoKc8Y+aTUEY829p66ECeY54JgX/ffU5MWdTTCMKrVDpjw FVy3gfSR9HOwHHuCF9Ie+po6zJVCGsSUvRWAM0JbvhrYR/ibz74sj7aeN Y2iBAp/EPdphcq7HWus5Ax0dezAWB+Jnrhny/IUHggU6vfulzyb+t5AgH E=; Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506302015; x=1537838015; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=KXttqifCMOvDJZUkozKtsykRYzgxBifc8NPpvLX7ox8=; b=BgNEeDS84cW5tQxxkDaP7vGSKz4Hjbqgqpqyd7ogW8vgqHNcSsS8vysH mr1OtcwXP/3QyZNFKjqcdcvzb6mbKQAhDvC67PUIGSYIdyRrJ+Yuh5GXY t232+pHcRnud5HnvyXGxM0wC5xEQoBRUSPLyOCZ8xpIlZs+qKUELOa+Vj g=; X-Host: ranger.odc.vzwcorp.com Thread-Topic: [PATCH review for 4.9 33/50] ceph: don't update_dentry_lease unless we actually got one Thread-Index: AQHTNZtpyawqbD3is0etpCIPLxQvJA== Accept-Language: en-US Content-Language: en-US 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" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 32 Organization: linux.* mail to news gateway X-Original-Cc: Jeff Layton , Ilya Dryomov , "Levin, Alexander (Sasha Levin)" X-Original-Date: Mon, 25 Sep 2017 01:12:53 +0000 X-Original-Message-ID: <20170925011225.10029-33-alexander.levin@verizon.com> X-Original-References: <20170925011225.10029-1-alexander.levin@verizon.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1738688 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, --=20 2.11.0