global: resurrect lockdep

Add 'lockdep' config option, and initialize g_lockdep from that in
global_init().

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index ac6d0e567da1eda0e676be8012f3fe3abdabf9f3..6541656d8d8e45111810ffacd81bdf8abe40ec76 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -23,6 +23,7 @@ OPTION(num_client, OPT_INT, 1)
 OPTION(monmap, OPT_STR, "")
 OPTION(mon_host, OPT_STR, "")
 OPTION(daemonize, OPT_BOOL, false)
+OPTION(lockdep, OPT_BOOL, false)
 OPTION(admin_socket, OPT_STR, "")
 OPTION(log_file, OPT_STR, "")
 OPTION(log_sym_dir, OPT_STR, "")

diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 5d9fa513de311fd3662f3d58ce38f00f75fbbafb..b23ef2b4bd46242f51329cd93dc5697d4080681b 100644 (file)
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -92,6 +92,8 @@ void global_init(std::vector < const char* >& args,
   // Expand metavariables. Invoke configuration observers.
   conf->apply_changes(NULL);
 
+  g_lockdep = cct->_conf->lockdep;
+
   // Now we're ready to complain about config file parse errors
   complain_about_parse_errors(cct, &parse_errors);