summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-volgen.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-volgen.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-volgen.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 5034b746ea1..0bad4bd144f 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -1886,7 +1886,7 @@ brick_graph_add_marker (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
if (ret)
goto out;
- snprintf (buf, sizeof (buf), "%d", volinfo->quota_version);
+ snprintf (buf, sizeof (buf), "%d", volinfo->quota_xattr_version);
ret = xlator_set_option (xl, "quota-version", buf);
if (ret)
goto out;