summaryrefslogtreecommitdiffstats
path: root/xlators/features/marker/src/marker.c
diff options
context:
space:
mode:
authorvmallika <vmallika@redhat.com>2015-10-06 13:44:34 +0530
committerRaghavendra G <rgowdapp@redhat.com>2015-10-08 21:01:50 -0700
commite42c560d4b6ff579d42e89f735eb6355d04346df (patch)
tree0cd5e2d57f24f9da934f25e51e3258f813446b49 /xlators/features/marker/src/marker.c
parent31ccc76f83a8035f58d26fffe9d100b287e285b6 (diff)
quota/marker: marker code cleanup
This is a backport of http://review.gluster.org/#/c/11560 marker is re-factored with syncop approach, remove unused old code > Change-Id: I36e670e63b6c166db5e64d3149d2978981e2f7c2 > BUG: 1240581 > Signed-off-by: vmallika <vmallika@redhat.com> > Reviewed-on: http://review.gluster.org/11560 > Tested-by: NetBSD Build System <jenkins@build.gluster.org> > Tested-by: Gluster Build System <jenkins@build.gluster.com> > Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Change-Id: I2151e2a6e17f27af136904d6ec4884f6aede379e BUG: 1267816 Signed-off-by: vmallika <vmallika@redhat.com> Reviewed-on: http://review.gluster.org/12268 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/features/marker/src/marker.c')
-rw-r--r--xlators/features/marker/src/marker.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index 66bdfbcaebd..c80237a3684 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -2995,15 +2995,8 @@ reconfigure (xlator_t *this, dict_t *options)
data = dict_get (options, "quota");
if (data) {
ret = gf_string2boolean (data->data, &flag);
- if (ret == 0 && flag == _gf_true) {
- ret = init_quota_priv (this);
- if (ret < 0) {
- gf_log (this->name, GF_LOG_WARNING,
- "failed to initialize quota private");
- } else {
- priv->feature_enabled |= GF_QUOTA;
- }
- }
+ if (ret == 0 && flag == _gf_true)
+ priv->feature_enabled |= GF_QUOTA;
}
data = dict_get (options, "inode-quota");
@@ -3074,13 +3067,8 @@ init (xlator_t *this)
data = dict_get (options, "quota");
if (data) {
ret = gf_string2boolean (data->data, &flag);
- if (ret == 0 && flag == _gf_true) {
- ret = init_quota_priv (this);
- if (ret < 0)
- goto err;
-
+ if (ret == 0 && flag == _gf_true)
priv->feature_enabled |= GF_QUOTA;
- }
}
data = dict_get (options, "inode-quota");