config: kill more unused options

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/config.cc b/src/config.cc
index 8e2e26b9dad0b18be72b675ca9f6706a316eff4f..22828d1b5bd3342a02f08d179e4e0d2912f09398 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -258,7 +258,6 @@ static struct config_option config_optionsp[] = {
        OPTION(pid_file, 0, OPT_STR, "/var/run/ceph/$type.$id.pid"),
        OPTION(conf, 'c', OPT_STR, "/etc/ceph/ceph.conf, ~/.ceph/config, ceph.conf"),
        OPTION(chdir, 0, OPT_STR, "/"),
-       OPTION(fakemessenger_serialize, 0, OPT_BOOL, true),
        OPTION(kill_after, 0, OPT_INT, 0),
        OPTION(max_open_files, 0, OPT_LONGLONG, 0),
        OPTION(debug, 0, OPT_INT, 0),
@@ -311,8 +310,6 @@ static struct config_option config_optionsp[] = {
        OPTION(mon_clock_drift_allowed, 0, OPT_FLOAT, .010), // allowed clock drift between monitors
        OPTION(mon_clock_drift_warn_backoff, 0, OPT_FLOAT, 5), // exponential backoff for clock drift warnings
        OPTION(mon_accept_timeout, 0, OPT_FLOAT, 10.0),    // on leader, if paxos update isn't accepted
-       OPTION(mon_stop_on_last_unmount, 0, OPT_BOOL, false),
-       OPTION(mon_stop_with_last_mds, 0, OPT_BOOL, false),
        OPTION(mon_pg_create_interval, 0, OPT_FLOAT, 30.0), // no more than every 30s
        OPTION(mon_globalid_prealloc, 0, OPT_INT, 100),   // how many globalids to prealloc
        OPTION(mon_osd_report_timeout, 0, OPT_INT, 900),    // grace period before declaring unresponsive OSDs dead
@@ -339,7 +336,6 @@ static struct config_option config_optionsp[] = {
        OPTION(client_snapdir, 0, OPT_STR, ".snap"),
        OPTION(client_mountpoint, 'r', OPT_STR, "/"),
        OPTION(client_notify_timeout, 0, OPT_INT, 10), // in seconds
-       OPTION(fuse_direct_io, 0, OPT_INT, 0),
        OPTION(client_oc, 0, OPT_BOOL, true),
        OPTION(client_oc_size, 0, OPT_INT, 1024*1024* 200),    // MB * n
        OPTION(client_oc_max_dirty, 0, OPT_INT, 1024*1024* 100),    // MB * n  (dirty OR tx.. bigish)
@@ -444,7 +440,6 @@ static struct config_option config_optionsp[] = {
        OPTION(osd_pg_bits, 0, OPT_INT, 9),  // bits per osd
        OPTION(osd_pgp_bits, 0, OPT_INT, 6),  // bits per osd
        OPTION(osd_lpg_bits, 0, OPT_INT, 2),  // bits per osd
-       OPTION(osd_object_layout, 0, OPT_INT, CEPH_OBJECT_LAYOUT_HASHINO),
        OPTION(osd_pg_layout, 0, OPT_INT, CEPH_PG_LAYOUT_CRUSH),
        OPTION(osd_min_rep, 0, OPT_INT, 1),
        OPTION(osd_max_rep, 0, OPT_INT, 10),

diff --git a/src/config.h b/src/config.h
index 614e1f4417d745670888ccd85549abc73fbc62eb..3dee2d5e2eec4bf029909a73e41e0baba5d594ba 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -101,8 +101,6 @@ struct md_config_t {
 
   const char *chdir;
 
-  bool fakemessenger_serialize;
-
   int kill_after;
 
   long long max_open_files;
@@ -175,8 +173,6 @@ struct md_config_t {
   float mon_clock_drift_warn_backoff;
   float mon_lease_ack_timeout;
   float mon_accept_timeout;
-  bool mon_stop_on_last_unmount;
-  bool mon_stop_with_last_mds;
   float mon_pg_create_interval;
   int mon_globalid_prealloc;
   int mon_osd_report_timeout;
@@ -209,7 +205,6 @@ struct md_config_t {
   long long client_readahead_max_periods;
   const char *client_snapdir;
   const char *client_mountpoint;
-  int fuse_direct_io;
 
   // objectcacher
   bool     client_oc;
@@ -346,7 +341,6 @@ struct md_config_t {
   int   osd_pg_bits;
   int   osd_pgp_bits;
   int   osd_lpg_bits;
-  int   osd_object_layout;
   int   osd_pg_layout;
   int   osd_min_rep;
   int   osd_max_rep;