summaryrefslogtreecommitdiffstats
path: root/glusterfsd/src
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2010-07-08 05:47:52 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-07-08 05:25:02 -0700
commit7e489f3cc7f3eb738d2698dcf588bad0bdc12a8b (patch)
treec99e2e430e0f51f0526c467141e9dd2087c0fca4 /glusterfsd/src
parentc35f6bf8f735eaf35c950d7b7789f6b64ba2c8c0 (diff)
fix up OS X after dynamic volume changes
Note that contrib is not needed to be in toplevel Makefile as its not a separate target, rather stuff is "pulled in" from there. Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 971 (dynamic volume management) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
Diffstat (limited to 'glusterfsd/src')
-rw-r--r--glusterfsd/src/glusterfsd.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index d1f9ae1513f..61e2fb7c3fd 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -651,12 +651,7 @@ generate_uuid ()
localtime_r (&tv.tv_sec, &now);
strftime (now_str, 32, "%Y/%m/%d-%H:%M:%S", &now);
- snprintf (tmp_str, 1024, "%s-%d-%s:%"
-#ifdef GF_DARWIN_HOST_OS
- PRId32,
-#else
- "ld",
-#endif
+ snprintf (tmp_str, 1024, "%s-%d-%s:%" GF_PRI_SUSECONDS,
hostname, getpid(), now_str, tv.tv_usec);
return gf_strdup (tmp_str);
@@ -1149,7 +1144,7 @@ daemonize (glusterfs_ctx_t *ctx)
if (cmd_args->debug_mode)
goto postfork;
- daemon (0, 0);
+ os_daemon (0, 0);
postfork:
ret = glusterfs_pidfile_update (ctx);