Merge remote-tracking branch 'gh/master' into wip-mon

7 files changed, 24 insertions, 9 deletions

diff --git a/src/cls/rbd/cls_rbd_client.h b/src/cls/rbd/cls_rbd_client.h
index c1d421a43a8..34cc45b8390 100644
--- a/src/cls/rbd/cls_rbd_client.h
+++ b/src/cls/rbd/cls_rbd_client.h
@@ -6,7 +6,6 @@
 
 #include "cls/lock/cls_lock_types.h"
 #include "common/snap_types.h"
-#include "include/rados.h"
 #include "include/rados/librados.hpp"
 #include "include/types.h"
 #include "librbd/parent_types.h"
diff --git a/src/common/config.cc b/src/common/config.cc
index 319b9d5782d..5c64f4ec151 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -119,10 +119,30 @@ bool ceph_resolve_file_search(const std::string& filename_list,
 md_config_t::md_config_t()
   : cluster("ceph"),
 
-#define OPTION(name, type, def_val) name(def_val),
+#define OPTION_OPT_INT(name, def_val) name(def_val),
+#define OPTION_OPT_LONGLONG(name, def_val) name((1LL) * def_val),
+#define OPTION_OPT_STR(name, def_val) name(def_val),
+#define OPTION_OPT_DOUBLE(name, def_val) name(def_val),
+#define OPTION_OPT_FLOAT(name, def_val) name(def_val),
+#define OPTION_OPT_BOOL(name, def_val) name(def_val),
+#define OPTION_OPT_ADDR(name, def_val) name(def_val),
+#define OPTION_OPT_U32(name, def_val) name(def_val),
+#define OPTION_OPT_U64(name, def_val) name(((uint64_t)1) * def_val),
+#define OPTION_OPT_UUID(name, def_val) name(def_val),
+#define OPTION(name, type, def_val) OPTION_##type(name, def_val)
 #define SUBSYS(name, log, gather)
 #define DEFAULT_SUBSYS(log, gather)
 #include "common/config_opts.h"
+#undef OPTION_OPT_INT
+#undef OPTION_OPT_LONGLONG
+#undef OPTION_OPT_STR
+#undef OPTION_OPT_DOUBLE
+#undef OPTION_OPT_FLOAT
+#undef OPTION_OPT_BOOL
+#undef OPTION_OPT_ADDR
+#undef OPTION_OPT_U32
+#undef OPTION_OPT_U64
+#undef OPTION_OPT_UUID
 #undef OPTION
 #undef SUBSYS
 #undef DEFAULT_SUBSYS
diff --git a/src/key_value_store/kv_flat_btree_async.cc b/src/key_value_store/kv_flat_btree_async.cc
index 68e1eab6b84..b055ad34141 100644
--- a/src/key_value_store/kv_flat_btree_async.cc
+++ b/src/key_value_store/kv_flat_btree_async.cc
@@ -20,7 +20,6 @@
 #include "common/ceph_context.h"
 #include "global/global_context.h"
 #include "common/Clock.h"
-#include "include/rados.h"
 #include "include/types.h"
 
 
diff --git a/src/key_value_store/kv_flat_btree_async.h b/src/key_value_store/kv_flat_btree_async.h
index 132d7987492..e0f09bd5c94 100644
--- a/src/key_value_store/kv_flat_btree_async.h
+++ b/src/key_value_store/kv_flat_btree_async.h
@@ -20,7 +20,7 @@
 
 #include "key_value_store/key_value_structure.h"
 #include "include/utime.h"
-#include "include/rados.h"
+#include "include/types.h"
 #include "include/encoding.h"
 #include "common/Mutex.h"
 #include "common/Clock.h"
diff --git a/src/librados/IoCtxImpl.h b/src/librados/IoCtxImpl.h
index 7e589a82f50..74ca1d09880 100644
--- a/src/librados/IoCtxImpl.h
+++ b/src/librados/IoCtxImpl.h
@@ -19,10 +19,9 @@
 #include "common/Mutex.h"
 #include "common/snap_types.h"
 #include "include/atomic.h"
-#include "include/rados.h"
+#include "include/types.h"
 #include "include/rados/librados.h"
 #include "include/rados/librados.hpp"
-#include "include/types.h"
 #include "include/xlist.h"
 #include "osd/osd_types.h"
 #include "osdc/Objecter.h"
diff --git a/src/os/hobject.h b/src/os/hobject.h
index 47fcb3dda39..3c1b0efee44 100644
--- a/src/os/hobject.h
+++ b/src/os/hobject.h
@@ -17,7 +17,6 @@
 
 #include <string.h>
 #include "include/types.h"
-#include "include/rados.h"
 #include "include/object.h"
 #include "include/cmp.h"
 
diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc
index c147b43f4cb..c7ea79d81d9 100644
--- a/src/test/cls_rbd/test_cls_rbd.cc
+++ b/src/test/cls_rbd/test_cls_rbd.cc
@@ -3,9 +3,8 @@
 
 #include "common/snap_types.h"
 #include "include/encoding.h"
-#include "include/rados.h"
-#include "include/rados/librados.h"
 #include "include/types.h"
+#include "include/rados/librados.h"
 #include "cls/rbd/cls_rbd.h"
 #include "cls/rbd/cls_rbd_client.h"