From bf5cf3318dd4c1af6409cdb01fe921f6ca215cf8 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 21 Feb 2013 16:04:24 -0800 Subject: [PATCH] Add rados_types.h header file Signed-off-by: David Zafman --- src/Makefile.am | 2 ++ src/include/rados/librados.h | 1 + src/include/rados/rados_types.h | 16 ++++++++++++++++ src/osdc/Objecter.h | 1 + 4 files changed, 20 insertions(+) create mode 100644 src/include/rados/rados_types.h diff --git a/src/Makefile.am b/src/Makefile.am index 60c3f2e5203dd..9c453df1f53b3 100644 --- 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 d40d9b588c24d..fec4bd6778cde 100644 --- a/src/include/rados/librados.h +++ b/src/include/rados/librados.h @@ -13,6 +13,7 @@ extern "C" { #include "include/inttypes.h" #endif #include +#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 index 0000000000000..a5579536b37dd --- /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 9ff02f6ab9380..692deba8c32e2 100644 --- 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 #include -- 2.39.5