From 0046bec7da3c9107864c193176ba505da6e120f9 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Sat, 10 Feb 2007 01:44:49 -0800
Subject: [PATCH] --- yaml --- r: 47503 b: refs/heads/master c:
 37756ced1f145aec18917812c3b8a96dbb47990d h: refs/heads/master i:   47501:
 77da9ffe6ed83654226e290edfa3bf0e9b814fa9   47499:
 f6a28bcb11e39086860774cb3d659e17c6eba5c8   47495:
 3dc8bc6e2e4e1a2ca5edcee208d1a22ae2c3c6ec   47487:
 167bc3405500b9507579bd1e1c9638e5da06183b v: v3

---
 [refs]                   | 2 +-
 trunk/fs/inode.c         | 4 +---
 trunk/include/linux/fs.h | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9bdf2944ac57..35353c10f533 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ba4d4c0c52201009232fe9e781a281054a24e75
+refs/heads/master: 37756ced1f145aec18917812c3b8a96dbb47990d
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
index bf21dc6d0dbd..6cacdab25e0a 100644
--- a/trunk/fs/inode.c
+++ b/trunk/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/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 1410e5330c8d..822c545c7209 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/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)