ubifs: Remove ifdefs around CONFIG_UBIFS_ATIME_SUPPORT

ifdefs reduce readability and compile coverage. This removes the ifdefs
around CONFIG_UBIFS_ATIME_SUPPORT by replacing them with IS_ENABLED()
where applicable. The fs layer would fall back to generic_update_time()
when .update_time doesn't exist. We do this fallback explicitly now.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Richard Weinberger <richard@nod.at>

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index d0c1228635f0..ed026ad6f455 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -129,9 +129,10 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum)
                 goto out_ino;
 
         inode->i_flags |= S_NOCMTIME;
-#ifndef CONFIG_UBIFS_ATIME_SUPPORT
-        inode->i_flags |= S_NOATIME;
-#endif
+
+        if (!IS_ENABLED(CONFIG_UBIFS_ATIME_SUPPORT))
+                inode->i_flags |= S_NOATIME;
+
         set_nlink(inode, le32_to_cpu(ino->nlink));
         i_uid_write(inode, le32_to_cpu(ino->uid));
         i_gid_write(inode, le32_to_cpu(ino->gid));
@@ -2248,11 +2249,10 @@ static struct dentry *ubifs_mount(struct file_system_type *fs_type, int flags,
                         goto out_deact;
                 /* We do not support atime */
                 sb->s_flags |= SB_ACTIVE;
-#ifndef CONFIG_UBIFS_ATIME_SUPPORT
-                sb->s_flags |= SB_NOATIME;
-#else
-                ubifs_msg(c, "full atime support is enabled.");
-#endif
+                if (IS_ENABLED(CONFIG_UBIFS_ATIME_SUPPORT))
+                        ubifs_msg(c, "full atime support is enabled.");
+                else
+                        sb->s_flags |= SB_NOATIME;
         }
 
         /* 'fill_super()' opens ubi again so we must close it here */