summaryrefslogtreecommitdiff
path: root/fs/ceph/caps.c
diff options
context:
space:
mode:
authorYan, Zheng <zheng.z.yan@intel.com>2013-02-27 09:26:09 +0800
committerSage Weil <sage@inktank.com>2013-05-01 21:14:32 -0700
commit964266cce94cee7e4aca42994fcda206c111e917 (patch)
tree015e18b06e2282a7fee1eb359267f131634357ed /fs/ceph/caps.c
parentd40ee0dcc1b27792b9b2f3905a5eaf4da061dbd5 (diff)
downloadlwn-964266cce94cee7e4aca42994fcda206c111e917.tar.gz
lwn-964266cce94cee7e4aca42994fcda206c111e917.zip
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>
Diffstat (limited to 'fs/ceph/caps.c')
-rw-r--r--fs/ceph/caps.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 0d54368490db..ea1f177739b2 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -553,6 +553,7 @@ retry:
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 @@ retry:
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;