]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: don't request CEPH_CAP_PIN from auth mds
authorYan, Zheng <zheng.z.yan@intel.com>
Fri, 15 Nov 2013 02:21:49 +0000 (10:21 +0800)
committerYan, Zheng <zheng.z.yan@intel.com>
Mon, 16 Dec 2013 04:15:24 +0000 (12:15 +0800)
avoid triggering assert(in->get_loner() >= 0 && in->mds_caps_wanted.empty())
in Locker::file_xsyn()

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
src/mds/Locker.cc

index 1015c8158e80ba1f5c3067447197a0844317257a..895bd964e5d85c492e6aef9e934ca26629d69c1a 100644 (file)
@@ -1926,7 +1926,7 @@ void Locker::request_inode_file_caps(CInode *in)
 {
   assert(!in->is_auth());
 
-  int wanted = in->get_caps_wanted();
+  int wanted = in->get_caps_wanted() & ~CEPH_CAP_PIN;
   if (wanted != in->replica_caps_wanted) {
     // wait for single auth
     if (in->is_ambiguous_auth()) {