Add rados_types.h header file

Signed-off-by: David Zafman <david.zafman@inktank.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 60c3f2e5203ddc8d9910a2c67d6b0d729aaa539f..9c453df1f53b3be9a42b964214bf9ea6b6a004e2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1182,6 +1182,7 @@ librbd_include_DATA = \
 rados_includedir = $(includedir)/rados
 rados_include_DATA = \
        $(srcdir)/include/rados/librados.h \
+       $(srcdir)/include/rados/rados_types.h \
        $(srcdir)/include/rados/librados.hpp \
        $(srcdir)/include/buffer.h \
        $(srcdir)/include/page.h \
@@ -1645,6 +1646,7 @@ noinst_HEADERS = \
        include/uuid.h\
         include/xlist.h\
        include/rados/librados.h\
+       include/rados/rados_types.h\
        include/rados/librados.hpp\
        include/rados/librgw.h\
        include/rados/page.h\

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index d40d9b588c24d00ca33ce9faa1806054e2f327cb..fec4bd6778cde9ae9d729faa75faea3368b08a96 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -13,6 +13,7 @@ extern "C" {
 #include "include/inttypes.h"
 #endif
 #include <string.h>
+#include "include/rados/rados_types.h"
 
 #ifndef CEPH_OSD_TMAP_SET
 /* These are also defined in rados.h and objclass.h. Keep them in sync! */

diff --git a/src/include/rados/rados_types.h b/src/include/rados/rados_types.h
new file mode 100644 (file)
index 0000000..a557953
--- /dev/null
+++ b/src/include/rados/rados_types.h
@@ -0,0 +1,16 @@
+#ifndef CEPH_RADOS_TYPES_H
+#define CEPH_RADOS_TYPES_H
+
+#include "include/inttypes.h"
+
+/**
+ * @struct obj_watch_t
+ * One item from list_watchers
+ */
+struct obj_watch_t {
+  int64_t watcher_id;
+  uint64_t cookie;
+  uint32_t timeout_seconds;
+}; 
+
+#endif

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 9ff02f6ab9380d0d1b94298270289565a840248a..692deba8c32e21beae4af3395d4cc40bb750797d 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -24,6 +24,7 @@
 
 #include "common/admin_socket.h"
 #include "common/Timer.h"
+#include "include/rados/rados_types.h"
 
 #include <list>
 #include <map>