config: reorder config_option struct members

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/common/config.cc b/src/common/config.cc
index cd041e0c894ef20485dec90e712224dada51de1e..541baa6c037591418fd9e02f9b5f28fc71156686 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -72,39 +72,39 @@ struct ceph_file_layout g_default_file_layout = {
 
 #define OPTION_OPT_STR(name, def_val) \
        { STRINGIFY(name) + TYCHECK(g_conf.name, std::string), \
-         offsetof(struct md_config_t, name), def_val, 0, 0, OPT_STR }
+         OPT_STR, offsetof(struct md_config_t, name), def_val, 0, 0 }
 
 #define OPTION_OPT_ADDR(name, def_val) \
        { STRINGIFY(name) + TYCHECK(g_conf.name, entity_addr_t), \
-        offsetof(struct md_config_t, name), def_val, 0, 0, OPT_ADDR }
+        OPT_ADDR, offsetof(struct md_config_t, name), def_val, 0, 0 }
 
 #define OPTION_OPT_LONGLONG(name, def_val) \
        { STRINGIFY(name) + TYCHECK(g_conf.name, long long), \
-         offsetof(struct md_config_t, name), 0, def_val, 0, OPT_LONGLONG }
+         OPT_LONGLONG, offsetof(struct md_config_t, name), 0, def_val, 0 }
 
 #define OPTION_OPT_INT(name, def_val) \
        { STRINGIFY(name) + TYCHECK(g_conf.name, int), \
-         offsetof(struct md_config_t, name), 0, def_val, 0, OPT_INT }
+         OPT_INT, offsetof(struct md_config_t, name), 0, def_val, 0 }
 
 #define OPTION_OPT_BOOL(name, def_val) \
        { STRINGIFY(name) + TYCHECK(g_conf.name, bool), \
-         offsetof(struct md_config_t, name), 0, def_val, 0, OPT_BOOL }
+         OPT_BOOL, offsetof(struct md_config_t, name), 0, def_val, 0 }
 
 #define OPTION_OPT_U32(name, def_val) \
        { STRINGIFY(name) + TYCHECK(g_conf.name, uint32_t), \
-         offsetof(struct md_config_t, name), 0, def_val, 0, OPT_U32 }
+         OPT_U32, offsetof(struct md_config_t, name), 0, def_val, 0 }
 
 #define OPTION_OPT_U64(name, def_val) \
        { STRINGIFY(name) + TYCHECK(g_conf.name, uint64_t), \
-         offsetof(struct md_config_t, name), 0, def_val, 0, OPT_U64 }
+         OPT_U64, offsetof(struct md_config_t, name), 0, def_val, 0 }
 
 #define OPTION_OPT_DOUBLE(name, def_val) \
        { STRINGIFY(name) + TYCHECK(g_conf.name, double), \
-        offsetof(struct md_config_t, name), 0, 0, def_val, OPT_DOUBLE }
+        OPT_DOUBLE, offsetof(struct md_config_t, name), 0, 0, def_val }
 
 #define OPTION_OPT_FLOAT(name, def_val) \
        { STRINGIFY(name) + TYCHECK(g_conf.name, float), \
-        offsetof(struct md_config_t, name), 0, 0, def_val, OPT_FLOAT }
+        OPT_FLOAT, offsetof(struct md_config_t, name), 0, 0, def_val }
 
 #define OPTION(name, type, def_val) OPTION_##type(name, def_val)
 

diff --git a/src/common/config.h b/src/common/config.h
index 64033ccf7c182a4b48570bd4d66ea037e5f56b7b..45ab3974886bcc2980bd79dda1607cc4a0fd2e64 100644 (file)
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -487,14 +487,13 @@ bool ceph_resolve_file_search(const std::string& filename_list,
 
 struct config_option {
   const char *name;
+  opt_type_t type;
   size_t md_conf_off;
 
   const char *def_str;
   long long def_longlong;
   double def_double;
 
-  opt_type_t type;
-
   // Given a configuration, return a pointer to this option inside
   // that configuration.
   void *conf_ptr(md_config_t *conf) const;