diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-02-03 17:49:49 -0500 |
---|---|---|
committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-02-03 17:49:49 -0500 |
commit | 01d206a7c1167639f6ca6dac22140fbdca017558 (patch) | |
tree | bc3ccf1a8140a7f787c4728cfa4c30e65ad56eb2 /fs/inode.c | |
parent | 9c4b562abc9005e4b413de02c85d3d29da707cba (diff) | |
parent | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff) |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/inode.c')
-rw-r--r-- | fs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c index 108138d4e909..d0be6159eb7f 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -1179,7 +1179,7 @@ EXPORT_SYMBOL(bmap); | |||
1179 | /** | 1179 | /** |
1180 | * touch_atime - update the access time | 1180 | * touch_atime - update the access time |
1181 | * @mnt: mount the inode is accessed on | 1181 | * @mnt: mount the inode is accessed on |
1182 | * @inode: inode accessed | 1182 | * @dentry: dentry accessed |
1183 | * | 1183 | * |
1184 | * Update the accessed time on an inode and mark it for writeback. | 1184 | * Update the accessed time on an inode and mark it for writeback. |
1185 | * This function automatically handles read only file systems and media, | 1185 | * This function automatically handles read only file systems and media, |