[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 <[email protected]>

--- linux-2.6.20-rc1-mm1/fs/inode.c	2006-12-14 02:14:23.000000000 +0100
+++ linux-2.6.20-rc1-mm1-ed/fs/inode.c	2006-12-15 20:14:31.000000000 +0100
@@ -1160,11 +1160,9 @@ void touch_atime(struct vfsmount *mnt, s
 	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;
--- linux-2.6.20-rc1-mm1/include/linux/fs.h	2006-12-15 15:46:16.000000000 +0100
+++ linux-2.6.20-rc1-mm1-ed/include/linux/fs.h	2006-12-15 20:16:13.000000000 +0100
@@ -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)

---

• References:
  • Re: + schedule_on_each_cpu-use-preempt_disable.patch added to -mm tree
    • From: Andrew Morton <[email protected]>
  • [PATCH] struct vfsmount : keep mnt_count & mnt_expiry_mark away from mnt_flags
    • From: Eric Dumazet <[email protected]>

• Prev by Date: [PATCH] remove ambiguous redefinition of INIT_WORK
• Next by Date: Re: [PATCH] support HDIO_GET_IDENTITY in libata
• Previous by thread: [PATCH] struct vfsmount : keep mnt_count & mnt_expiry_mark away from mnt_flags
• Next by thread: 2.6.19, more unwinder problems ...
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]