From 776d3814ccf2674cb44cd1e7b71866f6f72cf386 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Tue, 7 Jun 2011 10:17:40 -0700
Subject: [PATCH] init: set cct->module_type in common_preinit

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---
 src/common/ceph_argparse.cc | 5 +++--
 src/common/ceph_argparse.h  | 3 ++-
 src/common/common_init.cc   | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/common/ceph_argparse.cc b/src/common/ceph_argparse.cc
index a74b80ed62229..e8c5b802d33c5 100644
--- a/src/common/ceph_argparse.cc
+++ b/src/common/ceph_argparse.cc
@@ -220,8 +220,9 @@ bool parse_ip_port_vec(const char *s, vector<entity_addr_t>& vec)
 }
 
 // The defaults for CephInitParameters
-CephInitParameters::CephInitParameters(uint32_t module_type, const char *conf_file_)
-  : conf_file(conf_file_)
+CephInitParameters::CephInitParameters(uint32_t module_type_, const char *conf_file_)
+  : module_type(module_type_),
+    conf_file(conf_file_)
 {
   const char *c = getenv("CEPH_CONF");
   if (c)
diff --git a/src/common/ceph_argparse.h b/src/common/ceph_argparse.h
index 1b74a41d871fa..8f3ce93c30985 100644
--- a/src/common/ceph_argparse.h
+++ b/src/common/ceph_argparse.h
@@ -74,9 +74,10 @@ extern bool ceph_argparse_cmd_equals(const char *cmd, const char *opt,
 class CephInitParameters
 {
 public:
-  CephInitParameters(uint32_t module_type, const char *conf_file_);
+  CephInitParameters(uint32_t module_type_, const char *conf_file_);
   std::list<std::string> get_conf_files() const;
 
+  uint32_t module_type;
   std::string conf_file;
   EntityName name;
 };
diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index c436f7cd8d056..f0ade99f97173 100644
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -63,6 +63,7 @@ CephContext *common_preinit(const CephInitParameters &iparams,
       conf->set_val_or_die("daemonize", "false");
       break;
   }
+  cct->module_type = iparams.module_type;
   return cct;
 }
 
@@ -94,8 +95,6 @@ void common_init(std::vector < const char* >& args,
   CephContext *cct = common_preinit(iparams, code_env, flags);
   md_config_t *conf = cct->_conf;
 
-  cct->module_type = module_type;
-
   std::deque<std::string> parse_errors;
   int ret = conf->parse_config_files(iparams.get_conf_files(), &parse_errors);
   if (ret == -EDOM) {
-- 
2.39.5