From ef77131b44309404d7b1f492c8a92bc3dbf3e6b0 Mon Sep 17 00:00:00 2001 From: Kotresh HR 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. Backport of: >BUG: 1332465 >Change-Id: I36af4bb3e7043cc87dd19aea1985f3167ff82c18 >Reviewed-on: http://review.gluster.org/14183 BUG: 1332776 Change-Id: If23bde278347bfb4501f7ab6837f8886913358df Signed-off-by: Kotresh HR Reviewed-on: http://review.gluster.org/14193 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Atin Mukherjee --- xlators/mgmt/glusterd/src/glusterd-volume-set.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index b3fdf1ad5f9..0d8d63ed7aa 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1949,7 +1949,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, @@ -2648,28 +2648,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