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>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index ed8c7addce91..3c2dfd72e5b2 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -867,7 +867,7 @@ int __ceph_caps_file_wanted(struct ceph_inode_info *ci)
 /*
  * Return caps we have registered with the MDS(s) as 'wanted'.
  */
-int __ceph_caps_mds_wanted(struct ceph_inode_info *ci)
+int __ceph_caps_mds_wanted(struct ceph_inode_info *ci, bool check)
 {
         struct ceph_cap *cap;
         struct rb_node *p;
@@ -875,7 +875,7 @@ int __ceph_caps_mds_wanted(struct ceph_inode_info *ci)
 
         for (p = rb_first(&ci->i_caps); p; p = rb_next(p)) {
                 cap = rb_entry(p, struct ceph_cap, ci_node);
-                if (!__cap_is_valid(cap))
+                if (check && !__cap_is_valid(cap))
                         continue;
                 if (cap == ci->i_auth_cap)
                         mds_wanted |= cap->mds_wanted;
@@ -2491,7 +2491,7 @@ again:
                                 ret = 1;
                                 goto out_unlock;
                         }
-                        mds_wanted = __ceph_caps_mds_wanted(ci);
+                        mds_wanted = __ceph_caps_mds_wanted(ci, false);
                         if (need & ~(mds_wanted & need)) {
                                 dout("get_cap_refs %p caps were dropped"
                                      " (session killed?)\n", inode);