From a1957a3e77203033ce7e4ef70bab85f45f5c4164 Mon Sep 17 00:00:00 2001
From: Samikshan Bairagya <sbairagy@redhat.com>
Date: Mon, 10 Jul 2017 11:54:52 +0530
Subject: [PATCH 553/557] glusterd: Revert op-version for
 "cluster.max-brick-per-process"

The op-version for the "cluster.max-brick-per-process" option was
set to 3.12.0 in the upstream patch and was backported here:
https://code.engineering.redhat.com/gerrit/#/c/111799. This commit
reverts the op-version for this option to 3.11.1 instead.

Label: DOWNSTREAM ONLY

Change-Id: I23639cef43d41915eea0394d019b1e0796a99d7b
BUG: 1468950
Signed-off-by: Samikshan Bairagya <sbairagy@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/111804
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 libglusterfs/src/globals.h                      | 4 +---
 xlators/mgmt/glusterd/src/glusterd-volume-set.c | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h
index 01c52d3..caa7f64 100644
--- a/libglusterfs/src/globals.h
+++ b/libglusterfs/src/globals.h
@@ -43,7 +43,7 @@
  */
 #define GD_OP_VERSION_MIN  1 /* MIN is the fresh start op-version, mostly
                                 should not change */
-#define GD_OP_VERSION_MAX  GD_OP_VERSION_3_12_0 /* MAX VERSION is the maximum
+#define GD_OP_VERSION_MAX  GD_OP_VERSION_3_11_1 /* MAX VERSION is the maximum
                                                   count in VME table, should
                                                   keep changing with
                                                   introduction of newer
@@ -93,8 +93,6 @@
 
 #define GD_OP_VERSION_3_11_1   31101 /* Op-version for GlusterFS 3.11.1 */
 
-#define GD_OP_VERSION_3_12_0   31200 /* Op-version for GlusterFS 3.12.0 */
-
 #include "xlator.h"
 
 /* THIS */
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 03a220b..4b3c8df 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -3271,7 +3271,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         { .key         = GLUSTERD_BRICKMUX_LIMIT_KEY,
           .voltype     = "mgmt/glusterd",
           .value       = "1",
-          .op_version  = GD_OP_VERSION_3_12_0,
+          .op_version  = GD_OP_VERSION_3_11_1,
           .validate_fn = validate_mux_limit
         },
         { .key         = NULL
-- 
1.8.3.1