diff options
author | Yan, Zheng <zheng.z.yan@intel.com> | 2014-03-07 20:51:45 -0500 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2014-04-05 00:07:05 -0400 |
commit | a255060451dcb416c8097218b40d86d613d84bfc (patch) | |
tree | c3dc990fc565b01d586041093d007e4493c2a7f4 | |
parent | c137a32a408af7a5635f3d0c5ddd34d270af9a3b (diff) |
ceph: make sure write caps are registered with auth MDS
Only auth MDS can issue write caps to clients, so don't consider
write caps registered with non-auth MDS as valid.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
-rw-r--r-- | fs/ceph/caps.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 17543383545c..d9ef44e5474e 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c | |||
@@ -885,7 +885,10 @@ int __ceph_caps_mds_wanted(struct ceph_inode_info *ci) | |||
885 | cap = rb_entry(p, struct ceph_cap, ci_node); | 885 | cap = rb_entry(p, struct ceph_cap, ci_node); |
886 | if (!__cap_is_valid(cap)) | 886 | if (!__cap_is_valid(cap)) |
887 | continue; | 887 | continue; |
888 | mds_wanted |= cap->mds_wanted; | 888 | if (cap == ci->i_auth_cap) |
889 | mds_wanted |= cap->mds_wanted; | ||
890 | else | ||
891 | mds_wanted |= (cap->mds_wanted & ~CEPH_CAP_ANY_FILE_WR); | ||
889 | } | 892 | } |
890 | return mds_wanted; | 893 | return mds_wanted; |
891 | } | 894 | } |