[RHEL7,COMMIT] fuse: Switch unused engines off in Kconfig

Submitted by Konstantin Khorenko on Oct. 31, 2018, 10:55 a.m.

Details

Message ID 201810311055.w9VAtr88022991@finist-ce7.sw.ru
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko Oct. 31, 2018, 10:55 a.m.
The commit is pushed to "branch-rh7-3.10.0-862.14.4.vz7.72.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.14.4.vz7.72.15
------>
commit 34657e6f1bde6187c907e6688a0ce883ad9d9c15
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Wed Oct 31 13:55:52 2018 +0300

    fuse: Switch unused engines off in Kconfig
    
    We do not test and do not use these engines. They were
    needed on initial stage of development, but now their
    time is over.
    
    It's not safe to distribute untested (and never used)
    debug modules in production, so this patch disables
    them by default. Some time later, if there is no at least
    a single using of them in any purpose, we'll completely
    drop them.
    
    https://pmc.acronis.com/browse/VSTOR-16325
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    Reviewed-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
---
 configs/kernel-3.10.0-x86_64-debug.config   | 4 ++--
 configs/kernel-3.10.0-x86_64-minimal.config | 4 ++--
 configs/kernel-3.10.0-x86_64.config         | 4 ++--
 fs/fuse/Kconfig                             | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/configs/kernel-3.10.0-x86_64-debug.config b/configs/kernel-3.10.0-x86_64-debug.config
index 9ff450667838..758f7618abc1 100644
--- a/configs/kernel-3.10.0-x86_64-debug.config
+++ b/configs/kernel-3.10.0-x86_64-debug.config
@@ -6430,8 +6430,8 @@  CONFIG_NETFILTER_XT_MATCH_WDOG_TMO=m
 
 CONFIG_VE_IP_NF_VZPRIVNET=m
 
-CONFIG_FUSE_KIO_NOOP=m
-CONFIG_FUSE_KIO_NULLIO=m
+# CONFIG_FUSE_KIO_NOOP is not set
+# CONFIG_FUSE_KIO_NULLIO is not set
 CONFIG_FUSE_KIO_PCS=m
 
 CONFIG_FUSE_KIO_DEBUG=y
diff --git a/configs/kernel-3.10.0-x86_64-minimal.config b/configs/kernel-3.10.0-x86_64-minimal.config
index 4a5211f1dc47..037821b0dea5 100644
--- a/configs/kernel-3.10.0-x86_64-minimal.config
+++ b/configs/kernel-3.10.0-x86_64-minimal.config
@@ -3682,8 +3682,8 @@  CONFIG_QUOTACTL_COMPAT=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
-CONFIG_FUSE_KIO_NOOP=y
-CONFIG_FUSE_KIO_NULLIO=y
+# CONFIG_FUSE_KIO_NOOP is not set
+# CONFIG_FUSE_KIO_NULLIO is not set
 CONFIG_FUSE_KIO_PCS=y
 # CONFIG_FUSE_KIO_DEBUG is not set
 CONFIG_OVERLAY_FS=y
diff --git a/configs/kernel-3.10.0-x86_64.config b/configs/kernel-3.10.0-x86_64.config
index bdc91d414de6..8b5e2ade38f3 100644
--- a/configs/kernel-3.10.0-x86_64.config
+++ b/configs/kernel-3.10.0-x86_64.config
@@ -6401,8 +6401,8 @@  CONFIG_NETFILTER_XT_MATCH_WDOG_TMO=m
 
 CONFIG_VE_IP_NF_VZPRIVNET=m
 
-CONFIG_FUSE_KIO_NOOP=m
-CONFIG_FUSE_KIO_NULLIO=m
+# CONFIG_FUSE_KIO_NOOP is not set
+# CONFIG_FUSE_KIO_NULLIO is not set
 CONFIG_FUSE_KIO_PCS=m
 
 # CONFIG_FUSE_KIO_DEBUG is not set
diff --git a/fs/fuse/Kconfig b/fs/fuse/Kconfig
index b7fc9e8be4a2..8ecc12182e6a 100644
--- a/fs/fuse/Kconfig
+++ b/fs/fuse/Kconfig
@@ -29,6 +29,7 @@  config CUSE
 config FUSE_KIO_NOOP
 	tristate "Enable kdirect noop io engine"
 	depends on FUSE_FS
+	default n
 	help
 	  This FUSE extension allows to handle io requests directly inside kernel
 
@@ -37,6 +38,7 @@  config FUSE_KIO_NOOP
 config FUSE_KIO_NULLIO
 	tristate "Enable kdirect null io io engine"
 	depends on FUSE_FS
+	default n
 	help
 	  This FUSE extension allows to handle io requests directly inside kernel