diff options
| author | Christoph Hellwig <hch@lst.de> | 2006-01-09 20:52:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:01:31 -0800 |
| commit | 869243a0f6143f76e7c847e707eee6ece9cbf821 (patch) | |
| tree | bf14139c86988c40aa10587834141859049ec890 | |
| parent | 9cf6f4b3a3d24d8a41515b509b8fb6448f9201e9 (diff) | |
[PATCH] remove update_atime
All callers use touch_atime now which takes a vfsmount and allows us to
implement per-mount noatime.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/inode.c | 9 | ||||
| -rw-r--r-- | include/linux/fs.h | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/fs/inode.c b/fs/inode.c index e177769f3b4..76980a9c92e 100644 --- a/fs/inode.c +++ b/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/include/linux/fs.h b/include/linux/fs.h index 1feee2e7e47..85c5656756b 100644 --- a/include/linux/fs.h +++ b/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)) |