From 2455d61a1cb0f454fa008310b97e4c69fa3599e0 Mon Sep 17 00:00:00 2001
From: Kotresh HR <khiremat@redhat.com>
Date: Tue, 3 May 2016 14:47:19 +0530
Subject: glusterd/bitrot: Fix bitrot xlator_type

Fix "voltype" value for bitrot in 'glusterd_volopt_map'.
Routines such as 'gd_is_boolean_option' will use
the value of "voltype" to load the shared
library and figure out data type of specific options.
If the value of "voltype" does not match with
the actual shared library name, it will break such
routines.

>Change-Id: I36af4bb3e7043cc87dd19aea1985f3167ff82c18
>BUG: 1332465
>Signed-off-by: Kotresh HR <khiremat@redhat.com>
>Reviewed-on: http://review.gluster.org/14183
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
>Reviewed-by: Kaushal M <kaushal@redhat.com>
>Smoke: Gluster Build System <jenkins@build.gluster.com>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
(cherry picked from commit 29254449b19697b93ebf376541ea5062b4a99fcb)

Change-Id: Iae7b00272d2d5231ce46944064badacb1f09bc3b
BUG: 1332864
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Reviewed-on: http://review.gluster.org/14207
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
---
 xlators/mgmt/glusterd/src/glusterd-volume-set.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'xlators')

diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 89ccd2db084..e53e99739d2 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -2123,7 +2123,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
         },
 
         { .key         = VKEY_FEATURES_BITROT,
-          .voltype     = "features/bitrot",
+          .voltype     = "features/bit-rot",
           .option      = "bitrot",
           .value       = "disable",
           .type        = NO_DOC,
@@ -2864,28 +2864,28 @@ struct volopt_map_entry glusterd_volopt_map[] = {
           .flags      = OPT_FLAG_CLIENT_OPT
         },
         { .key        = "features.scrub-throttle",
-          .voltype    = "features/bitrot",
+          .voltype    = "features/bit-rot",
           .value      = "lazy",
           .option     = "scrub-throttle",
           .op_version = GD_OP_VERSION_3_7_0,
           .type       = NO_DOC,
         },
         { .key        = "features.scrub-freq",
-          .voltype    = "features/bitrot",
+          .voltype    = "features/bit-rot",
           .value      = "biweekly",
           .option     = "scrub-frequency",
           .op_version = GD_OP_VERSION_3_7_0,
           .type       = NO_DOC,
         },
         { .key        = "features.scrub",
-          .voltype    = "features/bitrot",
+          .voltype    = "features/bit-rot",
           .option     = "scrubber",
           .op_version = GD_OP_VERSION_3_7_0,
           .flags      = OPT_FLAG_FORCE,
           .type       = NO_DOC,
         },
         { .key        = "features.expiry-time",
-          .voltype    = "features/bitrot",
+          .voltype    = "features/bit-rot",
           .value      = SIGNING_TIMEOUT,
           .option     = "expiry-time",
           .op_version = GD_OP_VERSION_3_7_0,
-- 
cgit