From 7a14e07fadc7544b05d07923fb39428650dee77b Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 9 Jan 2006 20:52:03 -0800
Subject: [PATCH] --- yaml --- r: 17563 b: refs/heads/master c:
 869243a0f6143f76e7c847e707eee6ece9cbf821 h: refs/heads/master i:   17561:
 24b30ef9db848d97f910f7325e957fddac349e73   17559:
 b0e7ffe3683d049581633ea893624aff2c662920 v: v3

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

diff --git a/[refs] b/[refs]
index 2ba04b89fdf7..d9156096672e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cf6f4b3a3d24d8a41515b509b8fb6448f9201e9
+refs/heads/master: 869243a0f6143f76e7c847e707eee6ece9cbf821
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
index e177769f3b41..76980a9c92e7 100644
--- a/trunk/fs/inode.c
+++ b/trunk/fs/inode.c
@@ -1176,17 +1176,20 @@ sector_t bmap(struct inode * inode, sector_t block)
 EXPORT_SYMBOL(bmap);
 
 /**
- *	update_atime	-	update the access time
+ *	touch_atime	-	update the access time
+ *	@mnt: mount the inode is accessed on
  *	@inode: inode accessed
  *
  *	Update the accessed time on an inode and mark it for writeback.
  *	This function automatically handles read only file systems and media,
  *	as well as the "noatime" flag and inode specific "noatime" markers.
  */
-void update_atime(struct inode *inode)
+void touch_atime(struct vfsmount *mnt, struct dentry *dentry)
 {
+	struct inode *inode = dentry->d_inode;
 	struct timespec now;
 
+	/* per-mountpoint checks will go here */
 	if (IS_NOATIME(inode))
 		return;
 	if (IS_NODIRATIME(inode) && S_ISDIR(inode->i_mode))
@@ -1201,7 +1204,7 @@ void update_atime(struct inode *inode)
 	}
 }
 
-EXPORT_SYMBOL(update_atime);
+EXPORT_SYMBOL(touch_atime);
 
 /**
  *	file_update_time	-	update mtime and ctime time
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 1feee2e7e47b..85c5656756b6 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -235,9 +235,6 @@ struct kstatfs;
 struct vm_area_struct;
 struct vfsmount;
 
-/* Used to be a macro which just called the function, now just a function */
-extern void update_atime (struct inode *);
-
 extern void __init inode_init(unsigned long);
 extern void __init inode_init_early(void);
 extern void __init mnt_init(unsigned long);
@@ -1118,12 +1115,7 @@ static inline void mark_inode_dirty_sync(struct inode *inode)
 	__mark_inode_dirty(inode, I_DIRTY_SYNC);
 }
 
-static inline void touch_atime(struct vfsmount *mnt, struct dentry *dentry)
-{
-	/* per-mountpoint checks will go here */
-	update_atime(dentry->d_inode);
-}
-
+extern void touch_atime(struct vfsmount *mnt, struct dentry *dentry);
 static inline void file_accessed(struct file *file)
 {
 	if (!(file->f_flags & O_NOATIME))