Commit d40ee0dc authored by Yan, Zheng's avatar Yan, Zheng Committed by Sage Weil
Browse files

ceph: queue cap release when trimming cap 



So the client will later send cap release message to MDS

Signed-off-by: default avatarYan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: default avatarGreg Farnum <greg@inktank.com>
parent 8a034497

fs/ceph/caps.c

+3 −3
Original line number Diff line number Diff line
@@ -997,7 +997,7 @@ static int send_cap_msg(struct ceph_mds_session *session, 
	return 0;

}



static void __queue_cap_release(struct ceph_mds_session *session,

void __queue_cap_release(struct ceph_mds_session *session,

			 u64 ino, u64 cap_id, u32 migrate_seq,

			 u32 issue_seq)

{

fs/ceph/mds_client.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */

fs/ceph/super.h

+2 −0
Original line number Diff line number Diff line
@@ -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,