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