nilfs2: mark S_NOATIME on inodes only if NOATIME attribute is set

At present, nilfs marks S_NOATIME flag on all inodes.  This restricts
nilfs_set_inode_flags function so that it marks S_NOATIME only if a
given inode has an FS_NOATIME_FL flag.

Although nilfs does not support atime yet, touch_atime() still safely
returns on IS_NOATIME check since MS_NOATIME is always set on sb.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>

diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index f61f80c7f7ccf7e6f22b5440f691b76167eb7119..2e6ac8e9203a616569a7e48aeadfaa90939af626 100644 (file)
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -365,9 +365,7 @@ void nilfs_set_inode_flags(struct inode *inode)
                inode->i_flags |= S_APPEND;
        if (flags & FS_IMMUTABLE_FL)
                inode->i_flags |= S_IMMUTABLE;
-#ifndef NILFS_ATIME_DISABLE
        if (flags & FS_NOATIME_FL)
-#endif
                inode->i_flags |= S_NOATIME;
        if (flags & FS_DIRSYNC_FL)
                inode->i_flags |= S_DIRSYNC;