librbd: move object map codes to common location

These codes will need to be accessible from cls_rbd and librbd.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4ac584c34d576b489ed4c4862703b8fb427b3bc2)

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 5f57ee0e3d756087bb4f66cd82bcb69c4352fb82..ef2e0aeb8499f1ac27d4d05e1027d8697ff11752 100644 (file)
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -103,6 +103,7 @@ noinst_HEADERS += \
        include/rbd/features.h \
        include/rbd/librbd.h \
        include/rbd/librbd.hpp\
+       include/rbd/object_map_types.h \
        include/util.h\
        include/stat.h \
        include/on_exit.h \

diff --git a/src/include/rbd/object_map_types.h b/src/include/rbd/object_map_types.h
new file mode 100644 (file)
index 0000000..7776232
--- /dev/null
+++ b/src/include/rbd/object_map_types.h
@@ -0,0 +1,12 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+#ifndef CEPH_RBD_OBJECT_MAP_TYPES_H
+#define CEPH_RBD_OBJECT_MAP_TYPES_H
+
+#include "include/int_types.h"
+
+static const uint8_t OBJECT_NONEXISTENT  = 0;
+static const uint8_t OBJECT_EXISTS       = 1;
+static const uint8_t OBJECT_PENDING      = 2;
+
+#endif // CEPH_RBD_OBJECT_MAP_TYPES_H

diff --git a/src/librbd/ObjectMap.h b/src/librbd/ObjectMap.h
index 596f5cf6f4b705cc1029e4c1378359e26e9ead4e..20eb304a73b86066de68eac74fa6d4f8acf07a92 100644 (file)
--- a/src/librbd/ObjectMap.h
+++ b/src/librbd/ObjectMap.h
@@ -5,6 +5,7 @@
 
 #include "include/int_types.h"
 #include "include/rados/librados.hpp"
+#include "include/rbd/object_map_types.h"
 #include "common/bit_vector.hpp"
 #include "librbd/AsyncRequest.h"
 #include <boost/optional.hpp>
@@ -13,10 +14,6 @@ class Context;
 
 namespace librbd {
 
-static const uint8_t OBJECT_NONEXISTENT = 0;
-static const uint8_t OBJECT_EXISTS = 1;
-static const uint8_t OBJECT_PENDING = 2;
-
 class ImageCtx;
 
 class ObjectMap {