From 156022b67f5da2ca27a607ee9e7608fdf5e91a20 Mon Sep 17 00:00:00 2001 From: vmallika Date: Thu, 3 Dec 2015 14:55:36 +0530 Subject: glusterd/quota: quota-version conflict in export/import volinfo 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 Reviewed-on: http://review.gluster.org/12865 Tested-by: Gluster Build System Tested-by: NetBSD Build System Reviewed-by: Atin Mukherjee --- xlators/mgmt/glusterd/src/glusterd-quota.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-quota.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index 12198cc6cac..e58370af068 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c @@ -1499,12 +1499,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; } @@ -1515,7 +1515,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); } -- cgit