summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2011-04-05 10:22:57 +0000
committerVijay Bellur <vijay@gluster.com>2011-04-06 10:51:59 -0700
commit7bfaed649bf8a479afd051ea3c5adc7a4717b2fa (patch)
treeb1125fe4d80dd7073c841a0e730988e4c174c769
parent282109ed02a1ad220027bc69398941ba2b115cd2 (diff)
change occurrences of marker_gsync to marker-gsync
Signed-off-by: Vijay Bellur <vijay@gluster.com> BUG: 2473 (Support for volume and directory level quota) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2473
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 0ae4f93e3..970ee716d 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -1988,7 +1988,7 @@ glusterd_op_stage_gsync_set (dict_t *dict, char **op_errstr)
gf_log ("", GF_LOG_WARNING, "gsync not running");
*op_errstr = gf_strdup ("gsync not running");
glusterd_gsync_volinfo_dict_set (volinfo,
- "features.marker_gsync", "off");
+ "features.marker-gsync", "off");
ret = -1;
goto out;
} else if (ret == -1) {
@@ -3926,7 +3926,7 @@ glusterd_set_marker_gsync (char *master, char *value)
}
ret = glusterd_gsync_volinfo_dict_set (volinfo,
- "features.marker_gsync", value);
+ "features.marker-gsync", value);
if (ret < 0)
goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index bdfe19fe7..88ab2a27b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -141,7 +141,7 @@ static struct volopt_map_entry glusterd_volopt_map[] = {
{"performance.quick-read", "performance/quick-read", "!perf", "on", NO_DOC}, /* NODOC */
{"performance.stat-prefetch", "performance/stat-prefetch", "!perf", "on", NO_DOC}, /* NODOC */
- {"features.marker_gsync", "features/marker", "gsync", "off", NO_DOC},
+ {"features.marker-gsync", "features/marker", "gsync", "off", NO_DOC},
{"nfs.enable-ino32", "nfs/server", "nfs.enable-ino32", NULL, GLOBAL_DOC},
{"nfs.mem-factor", "nfs/server", "nfs.mem-factor", NULL, GLOBAL_DOC},
@@ -1140,7 +1140,7 @@ glusterd_gsync_option_set (glusterd_volinfo_t *volinfo,
GF_VALIDATE_OR_GOTO ("glusterd", xl, out);
GF_VALIDATE_OR_GOTO ("glusterd", set_dict, out);
- ret = volgen_dict_get (set_dict, "features.marker_gsync",
+ ret = volgen_dict_get (set_dict, "features.marker-gsync",
&gsync_val);
if (ret)
return -1;
@@ -1149,7 +1149,7 @@ glusterd_gsync_option_set (glusterd_volinfo_t *volinfo,
ret = gf_string2boolean (gsync_val, &gsync);
if (ret) {
gf_log ("", GF_LOG_ERROR,
- "value for marker_gsync option is junk");
+ "value for marker-gsync option is junk");
return -1;
}
get_vol_tstamp_file (tstamp_file, volinfo);