From 67cf38cead3786e054dca3b12bb39391e1e3b936 Mon Sep 17 00:00:00 2001
From: "Yan, Zheng" <zheng.z.yan@intel.com>
Date: Mon, 18 Feb 2013 13:43:43 +0800
Subject: [PATCH] --- yaml --- r: 373305 b: refs/heads/master c:
 d40ee0dcc1b27792b9b2f3905a5eaf4da061dbd5 h: refs/heads/master i:   373303:
 cf7c0ee5df67e4381fb8738d65b2158adcb19981 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/ceph/caps.c       | 6 +++---
 trunk/fs/ceph/mds_client.c | 2 ++
 trunk/fs/ceph/super.h      | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index da0571523845..aa961919fdd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a034497005491dc91ed7bfd660b04923d35d0e6
+refs/heads/master: d40ee0dcc1b27792b9b2f3905a5eaf4da061dbd5
diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c
index 78e2f575247d..0d54368490db 100644
--- a/trunk/fs/ceph/caps.c
+++ b/trunk/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/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c
index 6e67a3501673..fb7cb05d8aba 100644
--- a/trunk/fs/ceph/mds_client.c
+++ b/trunk/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/trunk/fs/ceph/super.h b/trunk/fs/ceph/super.h
index c7b309723dcc..86810b6d973b 100644
--- a/trunk/fs/ceph/super.h
+++ b/trunk/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,