From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Fri, 15 Nov 2013 02:21:49 +0000 (+0800)
Subject: mds: don't request CEPH_CAP_PIN from auth mds
X-Git-Tag: v0.75~93^2~21
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e1818692d145ab13798dd9259d96eadcca4c666c;p=ceph.git

mds: don't request CEPH_CAP_PIN from auth mds

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>
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 1015c8158e80b..895bd964e5d85 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -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()) {