use new api and fix some wrong flag caller

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 91ff002e1edd223e90e3b05d04601a55102c4ef5..8b88f58becb5c548a74b8d0b4c98d677cb9715fe 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -187,7 +187,7 @@ int main(int argc, const char **argv)
     exit(1);
 
   if (shadow != MDSMap::STATE_ONESHOT_REPLAY)
-    global_init_daemonize(g_ceph_context, 0);
+    global_init_daemonize(g_ceph_context);
   common_init_finish(g_ceph_context);
 
   // get monmap

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 3180b656e15d44cc5a6c2a96bf4751115afe60c4..edec5d9bfe166aa1ba830105ea6b4971a35b2cb7 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -339,7 +339,7 @@ int main(int argc, const char **argv)
     // resolve public_network -> public_addr
     pick_addresses(g_ceph_context, CEPH_PICK_ADDRESS_PUBLIC);
 
-    common_init_finish(g_ceph_context, flags);
+    common_init_finish(g_ceph_context);
 
     bufferlist monmapbl, osdmapbl;
     std::string error;
@@ -496,7 +496,7 @@ int main(int argc, const char **argv)
   // screwing us over
   Preforker prefork;
   if (!(flags & CINIT_FLAG_NO_DAEMON_ACTIONS)) {
-    if (global_init_prefork(g_ceph_context, 0) >= 0) {
+    if (global_init_prefork(g_ceph_context) >= 0) {
       string err_msg;
       err = prefork.prefork(err_msg);
       if (err < 0) {
@@ -749,7 +749,7 @@ int main(int argc, const char **argv)
   }
 
   if (g_conf->daemonize) {
-    global_init_postfork_finish(g_ceph_context, 0);
+    global_init_postfork_finish(g_ceph_context);
     prefork.daemonize();
   }
 

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 68d2c912b0ccb12cd8cf805dea0bb98389eb6e3b..7a429ff6bd4f5f1e2355740d75da4ed1c516e24f 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -535,7 +535,7 @@ int main(int argc, const char **argv)
     exit(1);
 
   // Set up crypto, daemonize, etc.
-  global_init_daemonize(g_ceph_context, 0);
+  global_init_daemonize(g_ceph_context);
   common_init_finish(g_ceph_context);
 
   TracepointProvider::initialize<osd_tracepoint_traits>(g_ceph_context);

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index f9133c54d6f801bd98a1b31019e9491aac004679..fca3ede9060eb12dd88eddcf146e845434679f9f 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -1046,7 +1046,7 @@ int main(int argc, const char **argv)
   check_curl();
 
   if (g_conf->daemonize) {
-    global_init_daemonize(g_ceph_context, 0);
+    global_init_daemonize(g_ceph_context);
   }
   Mutex mutex("main");
   SafeTimer init_timer(g_ceph_context, mutex);

diff --git a/src/rgw/rgw_object_expirer.cc b/src/rgw/rgw_object_expirer.cc
index 63f4e967db47a3e58713825eaa186366cf3d6797..dcbfbc1d3a43ad3b7e258726fc1e490561a4bcc6 100644 (file)
--- a/src/rgw/rgw_object_expirer.cc
+++ b/src/rgw/rgw_object_expirer.cc
@@ -73,7 +73,7 @@ int main(const int argc, const char **argv)
   }
 
   if (g_conf->daemonize) {
-    global_init_daemonize(g_ceph_context, 0);
+    global_init_daemonize(g_ceph_context);
   }
 
   common_init_finish(g_ceph_context);