diff options
| author | Amar Tumballi <amar@gluster.com> | 2011-06-08 23:37:22 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-06-16 09:15:28 -0700 |
| commit | e719518e561033af0ffd07d0c8ad7d777715fe89 (patch) | |
| tree | 8ede0ce4fbe1985dcbc749fd786c75de8cae00d5 /xlators/mgmt/glusterd | |
| parent | dad63fa8ac00397e337f328b0bb7b641e2680932 (diff) | |
fixing some build issues in Mac OS X
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2966 (MacOSX compile failure: duplicate symbol _k)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2966
Diffstat (limited to 'xlators/mgmt/glusterd')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rebalance.c | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 6df894ca7..6abdd822a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -3602,9 +3602,7 @@ rb_get_xattr_command (glusterd_volinfo_t *volinfo, goto out; } - ret = lgetxattr (mount_point_path, xattr_key, - value, - 8192); + ret = sys_lgetxattr (mount_point_path, xattr_key, value, 8192); if (ret < 0) { gf_log ("", GF_LOG_DEBUG, diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index f72a46801..75c175b16 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -24,7 +24,7 @@ #include <inttypes.h> #include <sys/resource.h> -#include <sys/vfs.h> +#include <sys/statvfs.h> #include "globals.h" #include "compat.h" @@ -58,8 +58,8 @@ gf_glusterd_rebalance_move_data (glusterd_volinfo_t *volinfo, const char *dir) char tmp_filename[PATH_MAX] = {0,}; char value[16] = {0,}; char linkinfo[PATH_MAX] = {0,}; - struct statfs src_statfs = {0,}; - struct statfs dst_statfs = {0,}; + struct statvfs src_statfs = {0,}; + struct statvfs dst_statfs = {0,}; if (!volinfo->defrag) goto out; @@ -118,12 +118,12 @@ gf_glusterd_rebalance_move_data (glusterd_volinfo_t *volinfo, const char *dir) /* Prevent data movement from a node which has higher disk-space to a node with lesser */ { - ret = statfs (full_path, &src_statfs); + ret = statvfs (full_path, &src_statfs); if (ret) gf_log ("", GF_LOG_INFO, "statfs on %s failed", full_path); - ret = statfs (tmp_filename, &dst_statfs); + ret = statvfs (tmp_filename, &dst_statfs); if (ret) gf_log ("", GF_LOG_INFO, "statfs on %s failed", tmp_filename); |