ceph: send cap releases more aggressively

When pending cap releases fill up one message, start a work to send
cap release message. (old way is sending cap releases every 5 seconds)

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

1 files changed, 12 insertions, 17 deletions

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 0eaf1b48c431..da5b56e14cc7 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1081,9 +1081,7 @@ void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release)
             (!session->s_cap_reconnect || cap->cap_gen == session->s_cap_gen)) {
                 cap->queue_release = 1;
                 if (removed) {
-                        list_add_tail(&cap->session_caps,
-                                      &session->s_cap_releases);
-                        session->s_num_cap_releases++;
+                        __ceph_queue_cap_release(session, cap);
                         removed = 0;
                 }
         } else {
@@ -1245,7 +1243,7 @@ static int send_cap_msg(struct cap_msg_args *arg)
  * Queue cap releases when an inode is dropped from our cache.  Since
  * inode is about to be destroyed, there is no need for i_ceph_lock.
  */
-void ceph_queue_caps_release(struct inode *inode)
+void __ceph_remove_caps(struct inode *inode)
 {
         struct ceph_inode_info *ci = ceph_inode(inode);
         struct rb_node *p;
@@ -3886,12 +3884,10 @@ void ceph_handle_caps(struct ceph_mds_session *session,
                         cap->seq = seq;
                         cap->issue_seq = seq;
                         spin_lock(&session->s_cap_lock);
-                        list_add_tail(&cap->session_caps,
-                                        &session->s_cap_releases);
-                        session->s_num_cap_releases++;
+                        __ceph_queue_cap_release(session, cap);
                         spin_unlock(&session->s_cap_lock);
                 }
-                goto flush_cap_releases;
+                goto done;
         }
 
         /* these will work even if we don't have a cap yet */
@@ -3961,7 +3957,12 @@ void ceph_handle_caps(struct ceph_mds_session *session,
                        ceph_cap_op_name(op));
         }
 
-        goto done;
+done:
+        mutex_unlock(&session->s_mutex);
+done_unlocked:
+        iput(inode);
+        ceph_put_string(extra_info.pool_ns);
+        return;
 
 flush_cap_releases:
         /*
@@ -3969,14 +3970,8 @@ flush_cap_releases:
          * along for the mds (who clearly thinks we still have this
          * cap).
          */
-        ceph_send_cap_releases(mdsc, session);
-
-done:
-        mutex_unlock(&session->s_mutex);
-done_unlocked:
-        iput(inode);
-        ceph_put_string(extra_info.pool_ns);
-        return;
+        ceph_flush_cap_releases(mdsc, session);
+        goto done;
 
 bad:
         pr_err("ceph_handle_caps: corrupt message\n");