summaryrefslogtreecommitdiffstats
path: root/src/ceph_fuse.cc
diff options
context:
space:
mode:
authorSage Weil <sage.weil@dreamhost.com>2012-04-19 06:58:14 +0200
committerSage Weil <sage.weil@dreamhost.com>2012-04-19 06:58:14 +0200
commite82c33099a0efda027bc7fa991dcd2073baea539 (patch)
tree2f2eb88a92a2d4cdf68f389106a1bc5423f58574 /src/ceph_fuse.cc
parentqa: drop rgw.py from test_python.sh workunit (diff)
downloadceph-e82c33099a0efda027bc7fa991dcd2073baea539.tar.xz
ceph-e82c33099a0efda027bc7fa991dcd2073baea539.zip
ceph-fuse: only call common_init_finish in child; fix admin socket
If we do it in the parent and child, we break the admin socket (among other things). Fixes: #2293 Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Diffstat (limited to 'src/ceph_fuse.cc')
-rw-r--r--src/ceph_fuse.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index b225e0578a4..d08cf859504 100644
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -115,9 +115,9 @@ int main(int argc, const char **argv, const char *envp[]) {
childpid = fork();
}
- common_init_finish(g_ceph_context);
-
if (childpid == 0) {
+ common_init_finish(g_ceph_context);
+
//cout << "child, mounting" << std::endl;
::close(fd[0]);