From: "Yan, Zheng" <ukernel@xxxxxxxxx> 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" <ukernel@xxxxxxxxx> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx> --- 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
