ceph: update wanted caps after resuming stale session

mds contains an optimization, it does not re-issue stale caps if
client does not want any cap.

A special case of the optimization is that client wants some caps,
but skipped updating 'wanted'. For this case, client needs to update
'wanted' when stale session get renewed.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

1 files changed, 23 insertions, 17 deletions

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 92643b828c50..94c026bba2c2 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -657,6 +657,9 @@ void ceph_add_cap(struct inode *inode,
                 session->s_nr_caps++;
                 spin_unlock(&session->s_cap_lock);
         } else {
+                if (cap->cap_gen < session->s_cap_gen)
+                        cap->issued = cap->implemented = CEPH_CAP_PIN;
+
                 /*
                  * auth mds of the inode changed. we received the cap export
                  * message, but still haven't received the cap import message.
@@ -3066,21 +3069,6 @@ static void handle_cap_grant(struct inode *inode,
 
 
         /*
-         * auth mds of the inode changed. we received the cap export message,
-         * but still haven't received the cap import message. handle_cap_export
-         * updated the new auth MDS' cap.
-         *
-         * "ceph_seq_cmp(seq, cap->seq) <= 0" means we are processing a message
-         * that was sent before the cap import message. So don't remove caps.
-         */
-        if (ceph_seq_cmp(seq, cap->seq) <= 0) {
-                WARN_ON(cap != ci->i_auth_cap);
-                WARN_ON(cap->cap_id != le64_to_cpu(grant->cap_id));
-                seq = cap->seq;
-                newcaps |= cap->issued;
-        }
-
-        /*
          * If CACHE is being revoked, and we have no dirty buffers,
          * try to invalidate (once).  (If there are dirty buffers, we
          * will invalidate _after_ writeback.)
@@ -3099,6 +3087,24 @@ static void handle_cap_grant(struct inode *inode,
                 }
         }
 
+        if (was_stale)
+                cap->issued = cap->implemented = CEPH_CAP_PIN;
+
+        /*
+         * auth mds of the inode changed. we received the cap export message,
+         * but still haven't received the cap import message. handle_cap_export
+         * updated the new auth MDS' cap.
+         *
+         * "ceph_seq_cmp(seq, cap->seq) <= 0" means we are processing a message
+         * that was sent before the cap import message. So don't remove caps.
+         */
+        if (ceph_seq_cmp(seq, cap->seq) <= 0) {
+                WARN_ON(cap != ci->i_auth_cap);
+                WARN_ON(cap->cap_id != le64_to_cpu(grant->cap_id));
+                seq = cap->seq;
+                newcaps |= cap->issued;
+        }
+
         /* side effects now are allowed */
         cap->cap_gen = session->s_cap_gen;
         cap->seq = seq;
@@ -3549,9 +3555,9 @@ retry:
                 goto out_unlock;
 
         if (target < 0) {
-                __ceph_remove_cap(cap, false);
-                if (!ci->i_auth_cap)
+                if (cap->mds_wanted | cap->issued)
                         ci->i_ceph_flags |= CEPH_I_CAP_DROPPED;
+                __ceph_remove_cap(cap, false);
                 goto out_unlock;
         }