From 0669cba457ae0da2bc3737c70455d8e3a0a628df Mon Sep 17 00:00:00 2001 From: Yunchuan Wen Date: Thu, 12 Nov 2015 14:30:03 +0800 Subject: [PATCH] use new api and fix some wrong flag caller Signed-off-by: Yunchuan Wen --- src/ceph_mds.cc | 2 +- src/ceph_mon.cc | 6 +++--- src/ceph_osd.cc | 2 +- src/rgw/rgw_main.cc | 2 +- src/rgw/rgw_object_expirer.cc | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index 91ff002e1edd2..8b88f58becb5c 100644 --- 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 3180b656e15d4..edec5d9bfe166 100644 --- 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 68d2c912b0ccb..7a429ff6bd4f5 100644 --- 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(g_ceph_context); diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index f9133c54d6f80..fca3ede9060eb 100644 --- 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 63f4e967db47a..dcbfbc1d3a43a 100644 --- 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); -- 2.39.5