import ceph quincy 17.2.4

[ceph.git] / ceph / src / mds / SimpleLock.h

diff --git a/ceph/src/mds/SimpleLock.h b/ceph/src/mds/SimpleLock.h
index 5c625b6af06f2819b80bbd2df7984f038f1c3d34..725c4488c17f0a8fb7eafb965decc36da7bf999c 100644 (file)
--- a/ceph/src/mds/SimpleLock.h
+++ b/ceph/src/mds/SimpleLock.h
@@ -256,8 +256,9 @@ public:
     return get_sm()->states[state].next == 0;
   }
   bool is_unstable_and_locked() const {
-    if (is_stable())
-      return false;
+    return (!is_stable() && is_locked());
+  }
+  bool is_locked() const {
     return is_rdlocked() || is_wrlocked() || is_xlocked();
   }
   int get_next_state() {