diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2007-02-10 10:44:49 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 19:51:25 +0100 |
commit | 37756ced1f145aec18917812c3b8a96dbb47990d (patch) | |
tree | a293813e3dce24a161c2cf029c4139086a23d978 /fs/inode.c | |
parent | [PATCH] struct vfsmount: keep mnt_count & mnt_expiry_mark away from mnt_flags (diff) | |
download | linux-37756ced1f145aec18917812c3b8a96dbb47990d.tar.xz linux-37756ced1f145aec18917812c3b8a96dbb47990d.zip |
[PATCH] avoid one conditional branch in touch_atime()
I added IS_NOATIME(inode) macro definition in include/linux/fs.h, true if
the inode superblock is marked readonly or noatime.
This new macro is then used in touch_atime() instead of separatly testing
MS_RDONLY and MS_NOATIME
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/inode.c')
-rw-r--r-- | fs/inode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/inode.c b/fs/inode.c index bf21dc6d0dbd..6cacdab25e0a 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1160,11 +1160,9 @@ void touch_atime(struct vfsmount *mnt, struct dentry *dentry) struct inode *inode = dentry->d_inode; struct timespec now; - if (IS_RDONLY(inode)) - return; if (inode->i_flags & S_NOATIME) return; - if (inode->i_sb->s_flags & MS_NOATIME) + if (IS_NOATIME(inode)) return; if ((inode->i_sb->s_flags & MS_NODIRATIME) && S_ISDIR(inode->i_mode)) return; |