import 15.2.5

[ceph.git] / ceph / src / client / Inode.h

diff --git a/ceph/src/client/Inode.h b/ceph/src/client/Inode.h
index 42dbddc97ec856ef8becf209c22efb25e443c77e..afaf64e0515ce36811abdf72cd068d11b9a1982e 100644 (file)
--- a/ceph/src/client/Inode.h
+++ b/ceph/src/client/Inode.h
@@ -109,11 +109,12 @@ struct CapSnap {
 };
 
 // inode flags
-#define I_COMPLETE     1
-#define I_DIR_ORDERED  2
-#define I_CAP_DROPPED  4
-#define I_SNAPDIR_OPEN 8
-#define I_KICK_FLUSH   16
+#define I_COMPLETE             (1 << 0)
+#define I_DIR_ORDERED          (1 << 1)
+#define I_SNAPDIR_OPEN         (1 << 2)
+#define I_KICK_FLUSH           (1 << 3)
+#define I_CAP_DROPPED          (1 << 4)
+#define I_ERROR_FILELOCK       (1 << 5)
 
 struct Inode {
   Client *client;
@@ -258,6 +259,12 @@ struct Inode {
   std::unique_ptr<ceph_lock_state_t> fcntl_locks;
   std::unique_ptr<ceph_lock_state_t> flock_locks;
 
+  bool has_any_filelocks() {
+    return
+      (fcntl_locks && !fcntl_locks->empty()) ||
+      (flock_locks && !flock_locks->empty());
+  }
+
   list<Delegation> delegations;
 
   xlist<MetaRequest*> unsafe_ops;