diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2013-05-31 12:37:11 +0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-04 02:32:48 +0400 |
| commit | b8c2f3ae2d9f2b975a0e1a9c5652829ef8a4f06c (patch) | |
| tree | 8b96ef32548d08a4829f001ec0be4d80c0abdd6d | |
| parent | fc2744aa12da7182509b1059aa3ab53754d0c83a (diff) | |
| download | linux-b8c2f3ae2d9f2b975a0e1a9c5652829ef8a4f06c.tar.xz | |
ceph: check migrate seq before changing auth cap
We may receive old request reply from the exporter MDS after receiving
the importer MDS' cap import message.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | fs/ceph/caps.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 54c290b083ab..790f88b15daf 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -612,9 +612,11 @@ retry: __cap_delay_requeue(mdsc, ci); } - if (flags & CEPH_CAP_FLAG_AUTH) - ci->i_auth_cap = cap; - else if (ci->i_auth_cap == cap) { + if (flags & CEPH_CAP_FLAG_AUTH) { + if (ci->i_auth_cap == NULL || + ceph_seq_cmp(ci->i_auth_cap->mseq, mseq) < 0) + ci->i_auth_cap = cap; + } else if (ci->i_auth_cap == cap) { ci->i_auth_cap = NULL; spin_lock(&mdsc->cap_dirty_lock); if (!list_empty(&ci->i_dirty_item)) { |