ceph: move max constant definitions

Move some definitions for max integer values out of the rbd code and
into the more central "decode.h" header file.  These really belong
in a Linux (or libc) header somewhere, but I haven't gotten around
to proposing that yet.

This is in preparation for moving some code out of rbd.c and into
the osd client.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index dea4401c4f77247459f8aea9fab77f362974d35e..6ed508bd363a857bbf95838d6394b0e440b4543c 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -52,13 +52,6 @@
 #define        SECTOR_SHIFT    9
 #define        SECTOR_SIZE     (1ULL << SECTOR_SHIFT)
 
-/* It might be useful to have these defined elsewhere */
-
-#define        U8_MAX  ((u8)   (~0U))
-#define        U16_MAX ((u16)  (~0U))
-#define        U32_MAX ((u32)  (~0U))
-#define        U64_MAX ((u64)  (~0ULL))
-
 #define RBD_DRV_NAME "rbd"
 #define RBD_DRV_NAME_LONG "rbd (rados block device)"
 

diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index 360d9d08ca9e2a12a56e85b5625a938d8a2f6b3a..689f1df37bff5104687e31cee573133d748f39db 100644 (file)
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -8,6 +8,13 @@
 
 #include <linux/ceph/types.h>
 
+/* This seemed to be the easiest place to define these */
+
+#define        U8_MAX  ((u8)  (~0U))
+#define        U16_MAX ((u16) (~0U))
+#define        U32_MAX ((u32) (~0U))
+#define        U64_MAX ((u64) (~0ULL))
+
 /*
  * in all cases,
  *   void **p     pointer to position pointer