diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
| commit | e6da74e1f20ea7822e52a9e4fbd3d25bd907e471 (patch) | |
| tree | d9b3bc7e654fb788d1cf3a1759b1b3c74cc56a04 /fs/inode.c | |
| parent | 1877c9ea66a29563987f22d0a86c66f438a87ce2 (diff) | |
| parent | 3c3b809e256c417847f1a96b2f9d9f66c7fcb02c (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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, |