The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh8-4.18.0-240.1.1.el8 ------> commit 8224414667a551bcfeb8f91c5ee67b7b296aecc9 Author: Konstantin Khorenko <khore...@virtuozzo.com> Date: Fri Dec 4 17:20:53 2020 +0300
Revert "fs/fuse: disable optimization fuse and kio_pcs in debug kernel" This reverts commit a9e2fa6238289f6a47f3f1b321ed6c0d53b77777. Reason: a lot of compilation errors like In file included from ././include/linux/compiler_types.h:58, from <command-line>: ./arch/x86/include/asm/jump_label.h: In function âpage_ref_incâ: ./include/linux/compiler-gcc.h:305:38: error: asm operand 0 probably doesnât match constraints [-Werror] #define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) ^~~ ./arch/x86/include/asm/jump_label.h:38:2: note: in expansion of macro âasm_volatile_gotoâ asm_volatile_goto("1:" ^~~~~~~~~~~~~~~~~ https://www.lkml.org/lkml/2019/3/20/63 Compilation errors can be fixed by adding "__always_inline" attributes but there are too many of them. So just revert the patch as the stabilization stage has passed long ago. Signed-off-by: Konstantin Khorenko <khore...@virtuozzo.com> --- configs/kernel-4.18.0-x86_64-KVM-minimal.config | 1 - configs/kernel-4.18.0-x86_64-debug.config | 1 - configs/kernel-4.18.0-x86_64.config | 1 - fs/fuse/Kconfig | 6 ------ fs/fuse/Makefile | 4 ---- 5 files changed, 13 deletions(-) diff --git a/configs/kernel-4.18.0-x86_64-KVM-minimal.config b/configs/kernel-4.18.0-x86_64-KVM-minimal.config index 7e7e9c054bbb..29f4de20def4 100644 --- a/configs/kernel-4.18.0-x86_64-KVM-minimal.config +++ b/configs/kernel-4.18.0-x86_64-KVM-minimal.config @@ -4025,7 +4025,6 @@ CONFIG_CUSE=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 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y diff --git a/configs/kernel-4.18.0-x86_64-debug.config b/configs/kernel-4.18.0-x86_64-debug.config index 9082fed09f71..9f326c78980f 100644 --- a/configs/kernel-4.18.0-x86_64-debug.config +++ b/configs/kernel-4.18.0-x86_64-debug.config @@ -6814,7 +6814,6 @@ CONFIG_VIRTIO_FS=m # CONFIG_FUSE_KIO_NOOP is not set # CONFIG_FUSE_KIO_NULLIO is not set CONFIG_FUSE_KIO_PCS=y -CONFIG_FUSE_KIO_DEBUG=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set # CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set diff --git a/configs/kernel-4.18.0-x86_64.config b/configs/kernel-4.18.0-x86_64.config index bb9e1856276a..0b16635922a0 100644 --- a/configs/kernel-4.18.0-x86_64.config +++ b/configs/kernel-4.18.0-x86_64.config @@ -6805,7 +6805,6 @@ CONFIG_VIRTIO_FS=m # 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=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set # CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set diff --git a/fs/fuse/Kconfig b/fs/fuse/Kconfig index cd98f5d99d73..1b0819e645da 100644 --- a/fs/fuse/Kconfig +++ b/fs/fuse/Kconfig @@ -59,9 +59,3 @@ config FUSE_KIO_PCS depends on FUSE_FS && INFINIBAND && INFINIBAND_ADDR_TRANS help This FUSE extension allows to forward io requests directly to PCS - -config FUSE_KIO_DEBUG - bool "Disable optimization for fuse kdirect PCS" - depends on DEBUG_KERNEL && FUSE_FS - help - Say Y if you want to disable optimization for fuse and fuse_kio_pcs modules. diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile index ccc0855a3ea8..9fe27bf1f9ba 100644 --- a/fs/fuse/Makefile +++ b/fs/fuse/Makefile @@ -2,10 +2,6 @@ # Makefile for the FUSE filesystem. # -ifdef CONFIG_FUSE_KIO_DEBUG - ccflags-y := -O0 -endif - obj-$(CONFIG_FUSE_FS) += fuse.o obj-$(CONFIG_CUSE) += cuse.o obj-$(CONFIG_VIRTIO_FS) += virtiofs.o
_______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel