ceph: queue cap release when trimming cap

So the client will later send cap release message to MDS

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

3 files changed, 7 insertions, 3 deletions

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 78e2f575247d..0d54368490db 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -997,9 +997,9 @@ static int send_cap_msg(struct ceph_mds_session *session,
         return 0;
 }
 
-static void __queue_cap_release(struct ceph_mds_session *session,
-                                u64 ino, u64 cap_id, u32 migrate_seq,
-                                u32 issue_seq)
+void __queue_cap_release(struct ceph_mds_session *session,
+                         u64 ino, u64 cap_id, u32 migrate_seq,
+                         u32 issue_seq)
 {
         struct ceph_msg *msg;
         struct ceph_mds_cap_release *head;
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 6e67a3501673..fb7cb05d8aba 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1197,6 +1197,8 @@ static int trim_caps_cb(struct inode *inode, struct ceph_cap *cap, void *arg)
         session->s_trim_caps--;
         if (oissued) {
                 /* we aren't the only cap.. just remove us */
+                __queue_cap_release(session, ceph_ino(inode), cap->cap_id,
+                                    cap->mseq, cap->issue_seq);
                 __ceph_remove_cap(cap);
         } else {
                 /* try to drop referring dentries */
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index c7b309723dcc..86810b6d973b 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -755,6 +755,8 @@ static inline void ceph_remove_cap(struct ceph_cap *cap)
 extern void ceph_put_cap(struct ceph_mds_client *mdsc,
                          struct ceph_cap *cap);
 
+extern void __queue_cap_release(struct ceph_mds_session *session, u64 ino,
+                                u64 cap_id, u32 migrate_seq, u32 issue_seq);
 extern void ceph_queue_caps_release(struct inode *inode);
 extern int ceph_write_inode(struct inode *inode, struct writeback_control *wbc);
 extern int ceph_fsync(struct file *file, loff_t start, loff_t end,