From dd1d565505d1f9c41dd6f151341f9337d89aa7cf Mon Sep 17 00:00:00 2001
From: Krutika Dhananjay <kdhananj@redhat.com>
Date: Tue, 6 Nov 2018 18:44:55 +0530
Subject: [PATCH 442/444] glusterd: Reset op-version for
 "features.shard-lru-limit"

The op-version for the "features.shard-lru-limit" option was set to
4.2.0 in the upstream patch and backported at
41e7e33c6512e98a1567e5a5532d3898b59cfa98

This commit reverts the op-version for this option to 3.13.4.

Label: DOWNSTREAM ONLY

Change-Id: I7d3ed6b373851267c78fc6815a83bee2c0906413
BUG: 1603118
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/155127
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Xavi Hernandez <xhernandez@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 555f44b..1bede2e 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_4_2_0 /* MAX VERSION is the maximum
+#define GD_OP_VERSION_MAX  GD_OP_VERSION_3_13_4 /* MAX VERSION is the maximum
                                                   count in VME table, should
                                                   keep changing with
                                                   introduction of newer
@@ -111,8 +111,6 @@
 
 #define GD_OP_VERSION_3_13_3   31303 /* Op-version for GlusterFS 3.13.3 */
 
-#define GD_OP_VERSION_4_2_0    40200 /* Op-version for GlusterFS 4.2.0 */
-
 /* Downstream only change */
 #define GD_OP_VERSION_3_11_2   31102 /* Op-version for RHGS 3.3.1-async */
 #define GD_OP_VERSION_3_13_3   31303 /* Op-version for RHGS-3.4-Batch Update-1*/
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index d442fe0..1175f1d 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -3300,7 +3300,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         },
         { .key        = "features.shard-lru-limit",
           .voltype    = "features/shard",
-          .op_version = GD_OP_VERSION_4_2_0,
+          .op_version = GD_OP_VERSION_3_13_4,
           .flags      = OPT_FLAG_CLIENT_OPT,
           .type       = NO_DOC,
         },
-- 
1.8.3.1