[Devel] [PATCH RHEL7 COMMIT] fs/fuse: fix debug build "CFLAGS was changed"

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-693.21.1.vz7.50.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.21.1.vz7.50.9
------>
commit 8b5a0e9af942eb4b154f41aed15d1e1d34ae0132
Author: Pavel Butsykin <pbutsykin at virtuozzo.com>
Date:   Sat Jun 9 12:16:31 2018 +0300

    fs/fuse: fix debug build "CFLAGS was changed"
    
    build error:
    Makefile.build:49: *** CFLAGS was changed in "./fs/fuse/Makefile".
    Fix it to use ccflags-y.  Stop.
    
    See (Documentation/kbuild/makefiles.txt, section 3.7) for details.
    
    Fixes: 7441fdfe4ddf ("fs/fuse: disable optimization fuse and kio_pcs in debug kernel")
    Signed-off-by: Pavel Butsykin <pbutsykin at virtuozzo.com>
---
 configs/kernel-3.10.0-x86_64-minimal.config | 1 +
 configs/kernel-3.10.0-x86_64.config         | 2 ++
 fs/fuse/Makefile                            | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/kernel-3.10.0-x86_64-minimal.config b/configs/kernel-3.10.0-x86_64-minimal.config
index 8a5357e4205d..2e904a9c0df3 100644
--- a/configs/kernel-3.10.0-x86_64-minimal.config
+++ b/configs/kernel-3.10.0-x86_64-minimal.config
@@ -3381,6 +3381,7 @@ CONFIG_FUSE_FS=y
 CONFIG_FUSE_KIO_NOOP=y
 CONFIG_FUSE_KIO_NULLIO=y
 CONFIG_FUSE_KIO_PCS=y
+# CONFIG_FUSE_KIO_DEBUG is not set
 CONFIG_OVERLAY_FS=y
 CONFIG_GENERIC_ACL=y
 
diff --git a/configs/kernel-3.10.0-x86_64.config b/configs/kernel-3.10.0-x86_64.config
index 4f417b048bd1..e2c9279b7da1 100644
--- a/configs/kernel-3.10.0-x86_64.config
+++ b/configs/kernel-3.10.0-x86_64.config
@@ -6073,6 +6073,8 @@ CONFIG_FUSE_KIO_NOOP=m
 CONFIG_FUSE_KIO_NULLIO=m
 CONFIG_FUSE_KIO_PCS=m
 
+# CONFIG_FUSE_KIO_DEBUG is not set
+
 #
 # User resources
 #
diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile
index 54dfe9f64feb..3eb06648da2c 100644
--- a/fs/fuse/Makefile
+++ b/fs/fuse/Makefile
@@ -3,7 +3,7 @@
 #
 
 ifdef CONFIG_FUSE_KIO_DEBUG
-	CFLAGS := -O0
+	ccflags-y := -O0
 endif
 
 obj-$(CONFIG_FUSE_FS) += fuse.o