commit 964266cce94cee7e4aca42994fcda206c111e917
author Yan, Zheng <zheng.z.yan@intel.com> Wed Feb 27 09:26:09 2013 +0800
committer Sage Weil <sage@inktank.com> Wed May 01 21:14:32 2013 -0700
tree 015e18b06e2282a7fee1eb359267f131634357ed
parent d40ee0dcc1b27792b9b2f3905a5eaf4da061dbd5

ceph: set mds_want according to cap import message

MDS ignores cap update message if migrate_seq mismatch, so when
receiving a cap import message with higher migrate_seq, set mds_want
according to the cap import message.

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

fs/ceph/caps.c

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 0d54368..ea1f177 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -553,6 +553,7 @@
 		cap->implemented = 0;
 		cap->mds = mds;
 		cap->mds_wanted = 0;
+		cap->mseq = 0;
 
 		cap->ci = ci;
 		__insert_cap_node(ci, cap);
@@ -628,7 +629,10 @@
 	cap->cap_id = cap_id;
 	cap->issued = issued;
 	cap->implemented |= issued;
-	cap->mds_wanted |= wanted;
+	if (mseq > cap->mseq)
+		cap->mds_wanted = wanted;
+	else
+		cap->mds_wanted |= wanted;
 	cap->seq = seq;
 	cap->issue_seq = seq;
 	cap->mseq = mseq;