|
 |
12a457 |
From 5df73ce534aceaf1a26f42c1a4fe90babd4e5bd4 Mon Sep 17 00:00:00 2001
|
|
|
12a457 |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
12a457 |
Date: Mon, 21 Mar 2016 22:31:02 +0530
|
|
|
12a457 |
Subject: [PATCH 14/26] libglusterfs/glusterd: Fix compilation errors
|
|
|
12a457 |
|
|
|
12a457 |
1. Removed duplicate definition of GD_OP_VER_PERSISTENT_AFR_XATTRS introduced in
|
|
|
12a457 |
d367a88 where GD_OP_VER_PERSISTENT_AFR_XATTRS was redfined
|
|
|
12a457 |
|
|
|
12a457 |
2. Fixed incorrect op-version
|
|
|
12a457 |
|
|
|
12a457 |
Label: DOWNSTREAM ONLY
|
|
|
12a457 |
|
|
|
12a457 |
BUG: 1319619
|
|
|
12a457 |
Change-Id: Icfa3206e8a41a11875641f57523732b80837f8f6
|
|
|
12a457 |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
12a457 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/70384
|
|
|
12a457 |
Reviewed-by: Nithya Balachandran <nbalacha@redhat.com>
|
|
|
12a457 |
---
|
|
|
12a457 |
libglusterfs/src/globals.h | 2 --
|
|
|
12a457 |
xlators/mgmt/glusterd/src/glusterd-store.c | 2 +-
|
|
|
12a457 |
2 files changed, 1 insertions(+), 3 deletions(-)
|
|
|
12a457 |
|
|
|
12a457 |
diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h
|
|
|
12a457 |
index fa8c0a9..cc23b6c 100644
|
|
|
12a457 |
--- a/libglusterfs/src/globals.h
|
|
|
12a457 |
+++ b/libglusterfs/src/globals.h
|
|
|
12a457 |
@@ -72,8 +72,6 @@
|
|
|
12a457 |
|
|
|
12a457 |
#define GD_OP_VERSION_3_7_7 30707 /* Op-version for GlusterFS 3.7.7 */
|
|
|
12a457 |
|
|
|
12a457 |
-#define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_3_6_0
|
|
|
12a457 |
-
|
|
|
12a457 |
#include "xlator.h"
|
|
|
12a457 |
|
|
|
12a457 |
/* THIS */
|
|
|
12a457 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
|
|
|
12a457 |
index 61af29a..ef12d42 100644
|
|
|
12a457 |
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
|
|
|
12a457 |
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
|
|
|
12a457 |
@@ -959,7 +959,7 @@ glusterd_volume_exclude_options_write (int fd, glusterd_volinfo_t *volinfo)
|
|
|
12a457 |
goto out;
|
|
|
12a457 |
}
|
|
|
12a457 |
|
|
|
12a457 |
- if (conf->op_version >= GD_OP_VERSION_3_6_0) {
|
|
|
12a457 |
+ if (conf->op_version >= GD_OP_VERSION_3_7_0) {
|
|
|
12a457 |
snprintf (buf, sizeof (buf), "%d", volinfo->disperse_count);
|
|
|
12a457 |
ret = gf_store_save_value (fd,
|
|
|
12a457 |
GLUSTERD_STORE_KEY_VOL_DISPERSE_CNT,
|
|
|
12a457 |
--
|
|
|
12a457 |
1.7.1
|
|
|
12a457 |
|