diff options
| author | Eric Dumazet | 2007-02-10 10:44:49 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2007-02-11 19:51:25 +0100 |
| commit | 37756ced1f145aec18917812c3b8a96dbb47990d (patch) | |
| tree | a293813e3dce24a161c2cf029c4139086a23d978 | |
| parent | [PATCH] struct vfsmount: keep mnt_count & mnt_expiry_mark away from mnt_flags (diff) | |
| download | kernel-qcow2-linux-37756ced1f145aec18917812c3b8a96dbb47990d.tar.gz kernel-qcow2-linux-37756ced1f145aec18917812c3b8a96dbb47990d.tar.xz kernel-qcow2-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>
| -rw-r--r-- | fs/inode.c | 4 | ||||
| -rw-r--r-- | include/linux/fs.h | 1 |
2 files changed, 2 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; diff --git a/include/linux/fs.h b/include/linux/fs.h index 1410e5330c8d..822c545c7209 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -169,6 +169,7 @@ extern int dir_notify_enable; #define IS_DIRSYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \ ((inode)->i_flags & (S_SYNC|S_DIRSYNC))) #define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK) +#define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME) #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA) #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND) |