X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=ceph%2Fsrc%2Ftools%2Frbd_nbd%2Frbd-nbd.cc;h=3d76ece42a8a98d0a4afb7bff3e024f924b9b089;hb=28e407b858acd3bddc89f68583571f771bb42e46;hp=098d9925ca29c6806385bd4dc301199b0680ad80;hpb=dfcb7b53b2e4fcd2a5af0240d4975adc711ab96e;p=ceph.git diff --git a/ceph/src/tools/rbd_nbd/rbd-nbd.cc b/ceph/src/tools/rbd_nbd/rbd-nbd.cc index 098d9925c..3d76ece42 100644 --- a/ceph/src/tools/rbd_nbd/rbd-nbd.cc +++ b/ceph/src/tools/rbd_nbd/rbd-nbd.cc @@ -595,14 +595,13 @@ static int do_map(int argc, const char *argv[], Config *cfg) cerr << err << std::endl; return r; } - if (forker.is_parent()) { - global_init_postfork_start(g_ceph_context); if (forker.parent_wait(err) != 0) { return -ENXIO; } return 0; } + global_init_postfork_start(g_ceph_context); } common_init_finish(g_ceph_context); @@ -761,9 +760,8 @@ static int do_map(int argc, const char *argv[], Config *cfg) cout << cfg->devpath << std::endl; if (g_conf->daemonize) { - forker.daemonize(); - global_init_postfork_start(g_ceph_context); global_init_postfork_finish(g_ceph_context); + forker.daemonize(); } {