summaryrefslogtreecommitdiff
path: root/fs/debugfs
diff options
context:
space:
mode:
authorVladis Dronov <vdronov@redhat.com>2020-08-11 17:01:29 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-04 18:12:52 +0200
commite3b9fc7eec55e6fdc8beeed18f2ed207086341e2 (patch)
tree9284d27813eeb7052edba394c0ccf9e4af2df8db /fs/debugfs
parent40b8b826a6998639dd1c26f0e127f18371e1058d (diff)
downloadlinux-rpi-e3b9fc7eec55e6fdc8beeed18f2ed207086341e2.tar.gz
linux-rpi-e3b9fc7eec55e6fdc8beeed18f2ed207086341e2.tar.bz2
linux-rpi-e3b9fc7eec55e6fdc8beeed18f2ed207086341e2.zip
debugfs: Fix module state check condition
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>
Diffstat (limited to 'fs/debugfs')
-rw-r--r--fs/debugfs/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index b167d2d02148..a768a09430c3 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -177,7 +177,7 @@ static int open_proxy_open(struct inode *inode, struct file *filp)
goto out;
if (!fops_get(real_fops)) {
-#ifdef MODULE
+#ifdef CONFIG_MODULES
if (real_fops->owner &&
real_fops->owner->state == MODULE_STATE_GOING)
goto out;
@@ -312,7 +312,7 @@ static int full_proxy_open(struct inode *inode, struct file *filp)
goto out;
if (!fops_get(real_fops)) {
-#ifdef MODULE
+#ifdef CONFIG_MODULES
if (real_fops->owner &&
real_fops->owner->state == MODULE_STATE_GOING)
goto out;