summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-quota.c
diff options
context:
space:
mode:
authorvmallika <vmallika@redhat.com>2015-12-03 14:55:36 +0530
committerAtin Mukherjee <amukherj@redhat.com>2015-12-08 23:25:25 -0800
commitf18432dde90fbea02ff656eecc916e8b04e0d516 (patch)
tree6bdbf0581410b6089a125d801be86f54c189ce54 /xlators/mgmt/glusterd/src/glusterd-quota.c
parent2142614f385352903d0cdb67657f2e639b79f72c (diff)
glusterd/quota: quota-version conflict in export/import volinfo
This is a backport of http://review.gluster.org/#/c/12865/ When exporting/importing voinfo during handshake, quota conf and quota xattr version were using same key 'quota-version' and updated wrong values when importing quota version values. > Change-Id: If939d6f5bc4851d4114963877be72dda21834f0f > BUG: 1287996 > Signed-off-by: vmallika <vmallika@redhat.com> Change-Id: Ic234d9e496f1372789112a0b82ba5cf34014de64 BUG: 1288052 Signed-off-by: vmallika <vmallika@redhat.com> Reviewed-on: http://review.gluster.org/12872 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-quota.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-quota.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
index 1830f0e8832..6495aa46d30 100644
--- a/xlators/mgmt/glusterd/src/glusterd-quota.c
+++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
@@ -1504,12 +1504,12 @@ glusterd_op_quota (dict_t *dict, char **op_errstr, dict_t *rsp_dict)
if (GF_QUOTA_OPTION_TYPE_ENABLE == type)
- volinfo->quota_version++;
+ volinfo->quota_xattr_version++;
ret = glusterd_store_volinfo (volinfo,
GLUSTERD_VOLINFO_VER_AC_INCREMENT);
if (ret) {
if (GF_QUOTA_OPTION_TYPE_ENABLE == type)
- volinfo->quota_version--;
+ volinfo->quota_xattr_version--;
goto out;
}
@@ -1520,7 +1520,7 @@ glusterd_op_quota (dict_t *dict, char **op_errstr, dict_t *rsp_dict)
"volfiles");
if (GF_QUOTA_OPTION_TYPE_ENABLE == type) {
/* rollback volinfo */
- volinfo->quota_version--;
+ volinfo->quota_xattr_version--;
ret = glusterd_store_volinfo (volinfo,
GLUSTERD_VOLINFO_VER_AC_INCREMENT);
}