diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2012-03-30 15:58:43 +0200 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-04-23 21:29:03 -0700 |
| commit | 7313b22f10fafe7773a15d8306496d1d56ef5f81 (patch) | |
| tree | 5080fcb607bbea24938444ef2eb5a031fee54793 /xlators | |
| parent | 92baa61bfe5853fca301eb1e10f063097df24e2e (diff) | |
NetBSD build fixes
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Change-Id: I8f9aabeadd2f842521a82e59594115bd80155d68
BUG: 2923
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.com/3053
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mount/fuse/src/fuse-helpers.c | 3 | ||||
| -rwxr-xr-x | xlators/mount/fuse/utils/mount_glusterfs.in | 3 | ||||
| -rw-r--r-- | xlators/storage/posix/src/posix-handle.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/xlators/mount/fuse/src/fuse-helpers.c b/xlators/mount/fuse/src/fuse-helpers.c index fbff1e39a0c..feec2399828 100644 --- a/xlators/mount/fuse/src/fuse-helpers.c +++ b/xlators/mount/fuse/src/fuse-helpers.c @@ -24,6 +24,9 @@ #include <sys/sysctl.h> #endif +#ifndef GF_REQUEST_MAXGROUPS +#define GF_REQUEST_MAXGROUPS 16 +#endif /* GF_REQUEST_MAXGROUPS */ static void fuse_resolve_wipe (fuse_resolve_t *resolve) diff --git a/xlators/mount/fuse/utils/mount_glusterfs.in b/xlators/mount/fuse/utils/mount_glusterfs.in index 3d4d286201e..b12b4e04e78 100755 --- a/xlators/mount/fuse/utils/mount_glusterfs.in +++ b/xlators/mount/fuse/utils/mount_glusterfs.in @@ -85,7 +85,7 @@ start_glusterfs () --volfile-server-transport=$transport"); else cmd_line=$(echo "$cmd_line \ ---volfile-server=$server_ip \ +--volfile-server=$server_ip"); fi else cmd_line=$(echo "$cmd_line --volfile=$volfile_loc"); @@ -173,6 +173,7 @@ main () [ -r "$volfile_loc" ] || { server_ip=$(echo "$volfile_loc" | sed -n 's/\([a-zA-Z0-9:.\-]*\):.*/\1/p'); + volume_id=$(echo "$volfile_loc" | sed -n 's/[a-zA-Z0-9:.\-]*:\(.*\)/\1/p'); volfile_loc=""; } # following line is product of love towards sed diff --git a/xlators/storage/posix/src/posix-handle.c b/xlators/storage/posix/src/posix-handle.c index 9b6df445ed5..38b28edc386 100644 --- a/xlators/storage/posix/src/posix-handle.c +++ b/xlators/storage/posix/src/posix-handle.c @@ -27,7 +27,9 @@ #include <sys/stat.h> #include <unistd.h> #include <libgen.h> +#ifdef GF_LINUX_HOST_OS #include <alloca.h> +#endif #include "posix-handle.h" #include "posix.h" |