summaryrefslogtreecommitdiffstats
path: root/contrib/qemu/util/oslib-posix.c
diff options
context:
space:
mode:
authorHarshavardhana <harsha@harshavardhana.net>2014-06-21 02:00:23 -0700
committergluster-ant <bugzilla-bot@gluster.org>2014-06-21 02:00:23 -0700
commitf456fa84da0e6ecafb0f6428fae75c934c2058d9 (patch)
tree9d738c29062ae78e90a5da95ad454f2d81ff7755 /contrib/qemu/util/oslib-posix.c
parent838da96ab0c2e0861d7e38e19fa4518b905b79d9 (diff)
downloadglusterfs-f456fa84da0e6ecafb0f6428fae75c934c2058d9.tar.gz
glusterfs-f456fa84da0e6ecafb0f6428fae75c934c2058d9.tar.xz
glusterfs-f456fa84da0e6ecafb0f6428fae75c934c2058d9.zip
porting: Port for FreeBSD rebased from Mike Ma's efforts
- Provides a working Gluster Management Daemon, CLI - Provides a working GlusterFS server, GlusterNFS server - Provides a working GlusterFS client - execinfo port from FreeBSD is moved into ./contrib/libexecinfo for ease of portability on NetBSD. (FreeBSD 10 and OSX provide execinfo natively) - More portability cleanups for Darwin, FreeBSD and NetBSD - Provides a new rc script for FreeBSD Change-Id: I8dff336f97479ca5a7f9b8c6b730051c0f8ac46f BUG: 1111774 Original-Author: Mike Ma <mikemandarine@gmail.com> Signed-off-by: Harshavardhana <harsha@harshavardhana.net> Reviewed-on: http://review.gluster.org/8141 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'contrib/qemu/util/oslib-posix.c')
-rw-r--r--contrib/qemu/util/oslib-posix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/qemu/util/oslib-posix.c b/contrib/qemu/util/oslib-posix.c
index 3dc8b1b074..5dceea5f58 100644
--- a/contrib/qemu/util/oslib-posix.c
+++ b/contrib/qemu/util/oslib-posix.c
@@ -93,7 +93,7 @@ void *qemu_memalign(size_t alignment, size_t size)
size, strerror(ret));
abort();
}
-#elif defined(CONFIG_BSD)
+#elif defined(GF_BSD_HOST_OS)
ptr = qemu_oom_check(valloc(size));
#else
ptr = qemu_oom_check(memalign(alignment, size));
@@ -193,7 +193,7 @@ int qemu_utimens(const char *path, const struct timespec *times)
struct timeval tv[2], tv_now;
struct stat st;
int i;
-#ifdef CONFIG_UTIMENSAT
+#if defined(CONFIG_UTIMENSAT) && !defined(__FreeBSD__)
int ret;
ret = utimensat(AT_FDCWD, path, times, AT_SYMLINK_NOFOLLOW);