diff options
author | Yan, Zheng <zyan@redhat.com> | 2017-01-29 09:15:47 -0500 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2017-02-20 06:16:07 -0500 |
commit | c1944fedd8c492ce1c1a99ca9064dcc7bafa80e9 (patch) | |
tree | 391d043097c793dacc36aae7c9c9e354d80553bb /fs/ceph/file.c | |
parent | 00f06cba53f53f3f7be8ac4f9ba2c2f6a94bca6f (diff) |
ceph: avoid calling ceph_renew_caps() infinitely
__ceph_caps_mds_wanted() ignores caps from stale session. So the
return value of __ceph_caps_mds_wanted() can keep the same across
ceph_renew_caps(). This causes try_get_cap_refs() to keep calling
ceph_renew_caps(). The fix is ignore the session valid check for
the try_get_cap_refs() case. If session is stale, just let the
caps requester sleep.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Diffstat (limited to 'fs/ceph/file.c')
-rw-r--r-- | fs/ceph/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 045d30d26624..beb24f8bb917 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c | |||
@@ -283,7 +283,7 @@ int ceph_open(struct inode *inode, struct file *file) | |||
283 | spin_lock(&ci->i_ceph_lock); | 283 | spin_lock(&ci->i_ceph_lock); |
284 | if (__ceph_is_any_real_caps(ci) && | 284 | if (__ceph_is_any_real_caps(ci) && |
285 | (((fmode & CEPH_FILE_MODE_WR) == 0) || ci->i_auth_cap)) { | 285 | (((fmode & CEPH_FILE_MODE_WR) == 0) || ci->i_auth_cap)) { |
286 | int mds_wanted = __ceph_caps_mds_wanted(ci); | 286 | int mds_wanted = __ceph_caps_mds_wanted(ci, true); |
287 | int issued = __ceph_caps_issued(ci, NULL); | 287 | int issued = __ceph_caps_issued(ci, NULL); |
288 | 288 | ||
289 | dout("open %p fmode %d want %s issued %s using existing\n", | 289 | dout("open %p fmode %d want %s issued %s using existing\n", |