From c732cb889b4a61254d06703bf032082e56b196de Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 25 Mar 2015 09:41:13 -0400 Subject: [PATCH] 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 (cherry picked from commit 4ac584c34d576b489ed4c4862703b8fb427b3bc2) --- src/include/Makefile.am | 1 + src/include/rbd/object_map_types.h | 12 ++++++++++++ src/librbd/ObjectMap.h | 5 +---- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 src/include/rbd/object_map_types.h diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 5f57ee0e3d756..ef2e0aeb8499f 100644 --- 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 index 0000000000000..7776232f10a48 --- /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 596f5cf6f4b70..20eb304a73b86 100644 --- 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 @@ -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 { -- 2.39.5