From 4a0a88b6660b48f773b6e7631e0be57b7f5048ed Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 9 Dec 2019 11:10:06 +0000 Subject: fs/adfs: dir: improve compiler coverage in adfs_dir_update Get rid of the ifdef, using IS_ENABLED() instead to detect whether the code should be callable. This allows the compiler to always parse the following code, reducing the chances of errors being missed. Signed-off-by: Russell King Signed-off-by: Al Viro --- fs/adfs/dir.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c index 5e5d344bae7c..931eefb2375b 100644 --- a/fs/adfs/dir.c +++ b/fs/adfs/dir.c @@ -287,14 +287,16 @@ unlock: int adfs_dir_update(struct super_block *sb, struct object_info *obj, int wait) { - int ret = -EINVAL; -#ifdef CONFIG_ADFS_FS_RW const struct adfs_dir_ops *ops = ADFS_SB(sb)->s_dir; struct adfs_dir dir; + int ret; printk(KERN_INFO "adfs_dir_update: object %06x in dir %06x\n", obj->indaddr, obj->parent_id); + if (!IS_ENABLED(CONFIG_ADFS_FS_RW)) + return -EINVAL; + if (!ops->update) return -EINVAL; @@ -328,7 +330,7 @@ forget: adfs_dir_forget(&dir); unlock: up_write(&adfs_dir_rwsem); -#endif + return ret; } -- cgit