andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix up OS X after dynamic volume changes

Browse Source 
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
This commit is contained in:
Csaba Henk 2010-07-08 05:47:52 +00:00 committed by Anand V. Avati
parent c35f6bf8f7
commit 7e489f3cc7
7 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,6 +1,6 @@
EXTRA_DIST = autogen.sh COPYING INSTALL README AUTHORS THANKS NEWS glusterfs.spec
SUBDIRS = argp-standalone libglusterfs rpc xlators glusterfsd $(FUSERMOUNT_SUBDIR) doc extras contrib
SUBDIRS = argp-standalone libglusterfs rpc xlators glusterfsd $(FUSERMOUNT_SUBDIR) doc extras
CLEANFILES =

3
configure.ac
View File

@ -120,7 +120,6 @@ AC_CONFIG_FILES([Makefile
extras/benchmarking/Makefile
extras/volgen/Makefile
extras/volgen/glusterfs-volgen
contrib/Makefile
contrib/fuse-util/Makefile
xlators/features/access-control/Makefile
xlators/features/access-control/src/Makefile
@ -230,7 +229,7 @@ AC_ARG_ENABLE([fusermount],
BUILD_FUSERMOUNT="no"
if test "x$enable_fusermount" = "xyes"; then
FUSERMOUNT_SUBDIR="contrib"
FUSERMOUNT_SUBDIR="contrib/fuse-util"
BUILD_FUSERMOUNT="yes"
AC_DEFINE(GF_FUSERMOUNT, 1, [Use our own fusermount])
fi

3
contrib/Makefile.am
View File

@ -1,3 +0,0 @@
SUBDIRS = fuse-util
CLEANFILES =

9
glusterfsd/src/glusterfsd.c
View File

@ -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);

2
libglusterfs/src/graph.c
View File

@ -416,7 +416,7 @@ fill_uuid (char *uuid, int size)
localtime_r (&tv.tv_sec, &now);
strftime (now_str, 32, "%Y/%m/%d-%H:%M:%S", &now);
snprintf (uuid, size, "%s-%d-%s:%ld",
snprintf (uuid, size, "%s-%d-%s:%"GF_PRI_SUSECONDS,
hostname, getpid(), now_str, tv.tv_usec);
return;

7
libglusterfs/src/logging.c
View File

@ -216,12 +216,7 @@ log:
strftime (timestr, 256, "%Y-%m-%d %H:%M:%S", tm);
snprintf (timestr + strlen (timestr), 256 - strlen (timestr),
#ifdef GF_DARWIN_HOST_OS
".%"PRId32,
#else
".%ld",
#endif
tv.tv_usec);
".%"GF_PRI_SUSECONDS, tv.tv_usec);
basename = strrchr (file, '/');
if (basename)

2
libglusterfs/src/logging.h
View File

@ -34,10 +34,12 @@
#define GF_PRI_FSBLK "u"
#define GF_PRI_DEV PRId32
#define GF_PRI_NLINK PRIu16
#define GF_PRI_SUSECONDS PRId32
#else
#define GF_PRI_FSBLK PRIu64
#define GF_PRI_DEV PRIu64
#define GF_PRI_NLINK PRIu32
#define GF_PRI_SUSECONDS "ld"
#endif
#define GF_PRI_BLKSIZE PRId32
#define GF_PRI_SIZET "zu"