14f8ab
From 44f758a56c5c5ad340ebc6d6a6478e8712c2c101 Mon Sep 17 00:00:00 2001
14f8ab
From: Atin Mukherjee <amukherj@redhat.com>
14f8ab
Date: Mon, 21 Mar 2016 22:31:02 +0530
14f8ab
Subject: [PATCH 05/52] libglusterfs/glusterd: Fix compilation errors
14f8ab
14f8ab
1. Removed duplicate definition of GD_OP_VER_PERSISTENT_AFR_XATTRS introduced in
14f8ab
d367a88 where GD_OP_VER_PERSISTENT_AFR_XATTRS was redfined
14f8ab
14f8ab
2. Fixed incorrect op-version
14f8ab
14f8ab
Label: DOWNSTREAM ONLY
14f8ab
14f8ab
Change-Id: Icfa3206e8a41a11875641f57523732b80837f8f6
14f8ab
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/70384
14f8ab
Reviewed-by: Nithya Balachandran <nbalacha@redhat.com>
14f8ab
---
14f8ab
 xlators/mgmt/glusterd/src/glusterd-store.c | 2 +-
14f8ab
 1 file changed, 1 insertion(+), 1 deletion(-)
14f8ab
14f8ab
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
14f8ab
index 64447e7..51ca3d1 100644
14f8ab
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
14f8ab
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
14f8ab
@@ -967,7 +967,7 @@ glusterd_volume_exclude_options_write(int fd, glusterd_volinfo_t *volinfo)
14f8ab
             goto out;
14f8ab
     }
14f8ab
 
14f8ab
-    if (conf->op_version >= GD_OP_VERSION_RHS_3_0) {
14f8ab
+    if (conf->op_version >= GD_OP_VERSION_3_7_0) {
14f8ab
         snprintf(buf, sizeof(buf), "%d", volinfo->disperse_count);
14f8ab
         ret = gf_store_save_value(fd, GLUSTERD_STORE_KEY_VOL_DISPERSE_CNT, buf);
14f8ab
         if (ret)
14f8ab
-- 
14f8ab
1.8.3.1
14f8ab