From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v6 07/13] ceph: don't take refs to want mask unless we have all bits Date: Mon, 2 Mar 2020 09:14:28 -0500 Message-ID: <20200302141434.59825-8-jlayton@kernel.org> References: <20200302141434.59825-1-jlayton@kernel.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Received: from mail.kernel.org ([198.145.29.99]:39072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727191AbgCBOOm (ORCPT ); Mon, 2 Mar 2020 09:14:42 -0500 In-Reply-To: <20200302141434.59825-1-jlayton@kernel.org> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: ceph-devel@vger.kernel.org Cc: idryomov@gmail.com, sage@redhat.com, zyan@redhat.com, pdonnell@redhat.com From: "Yan, Zheng" If we don't have all of the cap bits for the want mask in try_get_cap_refs, then just take refs on the need bits. Signed-off-by: "Yan, Zheng" Signed-off-by: Jeff Layton --- fs/ceph/caps.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Zheng, I broke this patch out on its own as I wasn't sure it was still needed with the latest iteration of the code. We can fold it into the previous one if we do want it, or just drop it. Thanks, Jeff diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 51483ba572b3..c60b28304c50 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -2616,7 +2616,10 @@ static int try_get_cap_refs(struct inode *inode, int need, int want, } snap_rwsem_locked = true; } - *got = need | (have & want); + if ((have & want) == want) + *got = need | want; + else + *got = need; if (S_ISREG(inode->i_mode) && (need & CEPH_CAP_FILE_RD) && !(*got & CEPH_CAP_FILE_CACHE)) -- 2.24.1