From 9796d4bf3015042f1b2bef22a2be6c22fed4cf4d Mon Sep 17 00:00:00 2001 From: Mohammed Junaid Ahmed Date: Wed, 16 Mar 2011 12:59:54 +0000 Subject: features/marker: Invalid option "marker", use "gsync" instead. Signed-off-by: Junaid Signed-off-by: Vijay Bellur BUG: 2473 (Support for volume and directory level quota) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2473 --- xlators/features/marker/src/marker.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'xlators') diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 83824891235..b629a7eb634 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -1579,8 +1579,15 @@ init_gsync_priv (xlator_t *this) int32_t ret = 0; marker_conf_t *priv = NULL; + if (!this) { + ret = -1; + goto out; + } + options = this->options; + priv = this->private; + if((data = dict_get (options, VOLUME_UUID)) != NULL) { priv->volume_uuid = data->data; @@ -1673,7 +1680,7 @@ init (xlator_t *this) } } - data = dict_get (options, "marker"); + data = dict_get (options, "gsync"); if (data) { if (strcmp (data->data, "on") == 0) { priv->feature_enabled |= GF_GSYNC; @@ -1773,6 +1780,6 @@ struct volume_options options[] = { {.key = {"volume-uuid"}}, {.key = {"timestamp-file"}}, {.key = {"quota"}}, - {.key = {"marker"}}, + {.key = {"gsync"}}, {.key = {NULL}} }; -- cgit