diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-04-17 15:54:34 -0700 | 
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2014-04-24 14:41:48 -0700 | 
| commit | a3cb38e3edf005bef73da4c9cfd958474a14d50f (patch) | |
| tree | a406029332a9eb096c14d441160bb670a42df8cb /xlators/mgmt/glusterd/src/glusterd-volume-set.c | |
| parent | 9c13471b109587a639662fc690384285bee02bc6 (diff) | |
build: MacOSX Porting fixes
git@forge.gluster.org:~schafdog/glusterfs-core/osx-glusterfs
Working functionality on MacOSX
 - GlusterD (management daemon)
 - GlusterCLI (management cli)
 - GlusterFS FUSE (using OSXFUSE)
 - GlusterNFS (without NLM - issues with rpc.statd)
Change-Id: I20193d3f8904388e47344e523b3787dbeab044ac
BUG: 1089172
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Signed-off-by: Dennis Schafroth <dennis@schafroth.com>
Tested-by: Harshavardhana <harsha@harshavardhana.net>
Tested-by: Dennis Schafroth <dennis@schafroth.com>
Reviewed-on: http://review.gluster.org/7503
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volume-set.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 24 | 
1 files changed, 20 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index 29e9f2b877c..1c5d359d9e3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -116,8 +116,8 @@ validate_cache_max_min_size (dict_t *dict, char *key, char *value,                                        "performance.cache-max-file-size",                                        ¤t_max_value);                  if (current_max_value) { -                        gf_string2bytesize (current_max_value, &max_value); -                        gf_string2bytesize (value, &min_value); +                        gf_string2bytesize_uint64 (current_max_value, &max_value); +                        gf_string2bytesize_uint64 (value, &min_value);                          current_min_value = value;                  }          } else  if ((!strcmp (key, "performance.cache-max-file-size")) || @@ -126,8 +126,8 @@ validate_cache_max_min_size (dict_t *dict, char *key, char *value,                                        "performance.cache-min-file-size",                                        ¤t_min_value);                  if (current_min_value) { -                        gf_string2bytesize (current_min_value, &min_value); -                        gf_string2bytesize (value, &max_value); +                        gf_string2bytesize_uint64 (current_min_value, &min_value); +                        gf_string2bytesize_uint64 (value, &max_value);                          current_max_value = value;                  }          } @@ -1370,6 +1370,18 @@ struct volopt_map_entry glusterd_volopt_map[] = {            .type        = GLOBAL_DOC,            .op_version  = 1          }, +        { .key         = "nfs.rpc-statd", +          .voltype     = "nfs/server", +          .option      = "nfs.rpc-statd", +          .type        = NO_DOC, +          .op_version  = 4, +        }, +        { .key         = "nfs.log-level", +          .voltype     = "nfs/server", +          .option      = "nfs.log-level", +          .type        = NO_DOC, +          .op_version  = 4, +        },          { .key         = "nfs.server-aux-gids",            .voltype     = "nfs/server",            .option      = "nfs.server-aux-gids", @@ -1434,6 +1446,10 @@ struct volopt_map_entry glusterd_volopt_map[] = {            .voltype     = "storage/posix",            .op_version  = 3          }, +        { .key         = "storage.xattr-user-namespace-mode", +          .voltype     = "storage/posix", +          .op_version  = 4 +        },          { .key         = "storage.owner-uid",            .voltype     = "storage/posix",            .option      = "brick-uid",  | 
