From: Yan, Zheng <zyan@redhat.com>
Date: Fri, 30 Oct 2015 09:21:11 +0000 (+0800)
Subject: mds: choose EXCL state for filelock when client has Fb capability
X-Git-Tag: v10.0.2~151^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=655ae79dd266dfd488aff67642aceab4ab383d01;p=ceph.git

mds: choose EXCL state for filelock when client has Fb capability

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index cb5d8f283c3b..2c384225b89d 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -2675,7 +2675,7 @@ void CInode::choose_lock_state(SimpleLock *lock, int allissued)
     if (lock->is_xlocked()) {
       // do nothing here
     } else if (lock->get_state() != LOCK_MIX) {
-      if (issued & CEPH_CAP_GEXCL)
+      if (issued & (CEPH_CAP_GEXCL | CEPH_CAP_GBUFFER))
 	lock->set_state(LOCK_EXCL);
       else if (issued & CEPH_CAP_GWR)
 	lock->set_state(LOCK_MIX);