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 <prasanna.kalever@redhat.com>
Reviewed-on: http://review.gluster.org/13964
Tested-by: Prasanna Kumar Kalever <pkalever@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>

4 files changed, 1 insertions, 29 deletions

diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 2ae9ef1acdb..866bec846f5 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -211,9 +211,6 @@ BuildRequires:    sqlite-devel
 %if ( 0%{!?_without_bd:1} )
 BuildRequires:    lvm2-devel
 %endif
-%if ( 0%{!?_without_qemu_block:1} )
-BuildRequires:    glib2-devel
-%endif
 %if ( 0%{!?_without_georeplication:1} )
 BuildRequires:    libattr-devel
 %endif
@@ -588,7 +585,6 @@ export CFLAGS
         %{?_without_georeplication} \
         %{?_with_firewalld} \
         %{?_without_ocf} \
-        %{?_without_qemu_block} \
         %{?_without_rdma} \
         %{?_without_syslog} \
         %{?_without_tiering}
diff --git a/tests/bugs/core/bug-1168803-snapd-option-validation-fix.t b/tests/bugs/core/bug-1168803-snapd-option-validation-fix.t
index 1e52d447507..89b015d6374 100755
--- a/tests/bugs/core/bug-1168803-snapd-option-validation-fix.t
+++ b/tests/bugs/core/bug-1168803-snapd-option-validation-fix.t
@@ -17,7 +17,7 @@ TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
 TEST $CLI volume set $V0 features.uss enable
 
 ## Now set another volume option, this should not fail
-TEST $CLI volume set $V0 features.file-snapshot on
+TEST $CLI volume set $V0 performance.io-cache off
 
 ## start the volume
 TEST $CLI volume start $V0
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,