summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorYan, Zheng <zyan@redhat.com>2020-03-10 19:34:20 +0800
committerIlya Dryomov <idryomov@gmail.com>2020-03-30 12:42:43 +0200
commit0aa971b6fd3f92afef6afe24ef78d9bb14471519 (patch)
tree96ba1545559e3c9dd2b29acaee2fb649f4e96862 /fs
parent42d70f8e31dfd3b795259b0d5c7ff4d4b45c24fd (diff)
downloadlinux-0aa971b6fd3f92afef6afe24ef78d9bb14471519.tar.gz
linux-0aa971b6fd3f92afef6afe24ef78d9bb14471519.tar.bz2
linux-0aa971b6fd3f92afef6afe24ef78d9bb14471519.zip
ceph: don't skip updating wanted caps when cap is stale
1. try_get_cap_refs() fails to get caps and finds that mds_wanted does not include what it wants. It returns -ESTALE. 2. ceph_get_caps() calls ceph_renew_caps(). ceph_renew_caps() finds that inode has cap, so it calls ceph_check_caps(). 3. ceph_check_caps() finds that issued caps (without checking if it's stale) already includes caps wanted by open file, so it skips updating wanted caps. Above events can cause an infinite loop inside ceph_get_caps(). Signed-off-by: "Yan, Zheng" <zyan@redhat.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/caps.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 086bb3adc08a..be1ae4b92cfd 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2008,8 +2008,12 @@ retry_locked:
}
/* want more caps from mds? */
- if (want & ~(cap->mds_wanted | cap->issued))
- goto ack;
+ if (want & ~cap->mds_wanted) {
+ if (want & ~(cap->mds_wanted | cap->issued))
+ goto ack;
+ if (!__cap_is_valid(cap))
+ goto ack;
+ }
/* things we might delay */
if ((cap->issued & ~retain) == 0)