mds: use #defines for bits per cap

Hard-coding 0xff in SimpleLock.h is too far away from where we add new cap
bits.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index ddfe2fc7924c9dd2571b64957b231bec23f3ecdd..6c41d14f5da9cd37488e0c95dcf92281a3754199 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -536,14 +536,17 @@ int ceph_flags_to_mode(int flags);
 #define CEPH_CAP_GWREXTEND  64  /* (file) client can extend EOF */
 #define CEPH_CAP_GLAZYIO   128  /* (file) client can perform lazy io */
 
+#define CEPH_CAP_SIMPLE_BITS  2
+#define CEPH_CAP_FILE_BITS    8
+
 /* per-lock shift */
 #define CEPH_CAP_SAUTH      2
 #define CEPH_CAP_SLINK      4
 #define CEPH_CAP_SXATTR     6
 #define CEPH_CAP_SFILE      8
-#define CEPH_CAP_SFLOCK    20 
+#define CEPH_CAP_SFLOCK    20
 
-#define CEPH_CAP_BITS       22
+#define CEPH_CAP_BITS      22
 
 /* composed values */
 #define CEPH_CAP_AUTH_SHARED  (CEPH_CAP_GSHARED  << CEPH_CAP_SAUTH)

diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h
index 9531a0148d4632789cde7f41ed1e10d6248a0fdb..bfd0e1f41cf1874352c7053604d6e6fb3f8220c9 100644 (file)
--- a/src/mds/SimpleLock.h
+++ b/src/mds/SimpleLock.h
@@ -273,8 +273,8 @@ public:
   }
   int get_cap_mask() const {
     switch (get_type()) {
-    case CEPH_LOCK_IFILE: return 0xff;
-    default: return 0x3;
+    case CEPH_LOCK_IFILE: return (1 << CEPH_CAP_FILE_BITS) - 1;
+    default: return (1 << CEPH_CAP_SIMPLE_BITS) - 1;
     }
   }