From bfd5c7683708949e87bd40fb0ddb6933021c6912 Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Mon, 11 Apr 2016 15:28:07 +0530 Subject: qemu-block: mop leftover code This patch cleans off the code that was leftover by '6860968' which basically remove qemu-block from gluster code repo Also update 'bug-1168803-snapd-option-validation-fix.t' which previously used 'features.file-snapshot' for checking 'volume set' for some reason. Change-Id: I2c4f28e186b74a4ce55d48c0fa7f3f79ca1901b5 BUG: 1198849 Signed-off-by: Prasanna Kumar Kalever Reviewed-on: http://review.gluster.org/13964 Tested-by: Prasanna Kumar Kalever Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Niels de Vos --- xlators/mgmt/glusterd/src/glusterd-volgen.c | 14 -------------- xlators/mgmt/glusterd/src/glusterd-volume-set.c | 10 ---------- 2 files changed, 24 deletions(-) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index de8a795df91..44b3e777490 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -4038,20 +4038,6 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, } } - - ret = dict_get_str_boolean (set_dict, "features.file-snapshot", - _gf_false); - if (ret == -1) - goto out; - if (ret) { - xl = volgen_graph_add (graph, "features/qemu-block", volname); - - if (!xl) { - ret = -1; - goto out; - } - } - /* Do not allow changing read-after-open option if root-squash is enabled. */ diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index cb7d5a59d4e..ecec57b4159 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1792,16 +1792,6 @@ struct volopt_map_entry glusterd_volopt_map[] = { }, /* Feature translators */ - { .key = "features.file-snapshot", - .voltype = "features/qemu-block", - .option = "!feat", - .value = "off", - .op_version = 3, - .description = "enable/disable file-snapshot feature in the " - "volume.", - .flags = OPT_FLAG_CLIENT_OPT | OPT_FLAG_XLATOR_OPT - }, - { .key = "features.uss", .voltype = "features/snapview-server", .op_version = GD_OP_VERSION_3_6_0, -- cgit