From ceec802073ef1a539d7605172c44f5f961758f6d Mon Sep 17 00:00:00 2001

From: Vladis Dronov <vdronov@redhat.com>

Date: Tue, 11 Aug 2020 17:01:29 +0200

Subject: [PATCH 4/6] debugfs: Fix module state check condition

Git-commit: e3b9fc7eec55e6fdc8beeed18f2ed207086341e2

Patch-mainline: v5.9-rc5

References: git-fixes

The '#ifdef MODULE' check in the original commit does not work as intended.

The code under the check is not built at all if CONFIG_DEBUG_FS=y. Fix this

by using a correct check.

Fixes: 275678e7a9be ("debugfs: Check module state before warning in {full/open}_proxy_open()")

Signed-off-by: Vladis Dronov <vdronov@redhat.com>

Cc: stable <stable@vger.kernel.org>

Link: https://lore.kernel.org/r/20200811150129.53343-1-vdronov@redhat.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

 fs/debugfs/file.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c

index 0203582d7474..b5dcdf658fa2 100644

--- a/fs/debugfs/file.c

+++ b/fs/debugfs/file.c

@@ -152,7 +152,7 @@ static int open_proxy_open(struct inode *inode, struct file *filp)

 	real_fops = debugfs_real_fops(filp);

 	if (!fops_get(real_fops)) {

-#ifdef MODULE

+#ifdef CONFIG_MODULES

 		if (real_fops->owner &&

 		    real_fops->owner->state == MODULE_STATE_GOING)

 			goto out;

@@ -282,7 +282,7 @@ static int full_proxy_open(struct inode *inode, struct file *filp)

 	real_fops = debugfs_real_fops(filp);

 	if (!fops_get(real_fops)) {

-#ifdef MODULE

+#ifdef CONFIG_MODULES

 		if (real_fops->owner &&

 		    real_fops->owner->state == MODULE_STATE_GOING)

 			goto out;

-- 

2.16.4