diff options
| author | Alex Elder <aelder@sgi.com> | 2009-10-08 14:53:44 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-10-08 14:53:44 -0400 |
| commit | e09d39968bd8befa087f10f970fa236e8694b643 (patch) | |
| tree | 393f4cdd32504ed435b7a5f728cf74855378459d /fs/xfs/xfs_inode.h | |
| parent | fdec29c5fcd2705d61c1d14a1d4c74be03e9627c (diff) | |
| parent | d0800703febc04827b8fa91921aa4e254d01e8d1 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/xfs_inode.h')
| -rw-r--r-- | fs/xfs/xfs_inode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 0b38b9a869ec..41555de1d1db 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h | |||
| @@ -504,7 +504,7 @@ void xfs_ichgtime(xfs_inode_t *, int); | |||
| 504 | void xfs_lock_inodes(xfs_inode_t **, int, uint); | 504 | void xfs_lock_inodes(xfs_inode_t **, int, uint); |
| 505 | void xfs_lock_two_inodes(xfs_inode_t *, xfs_inode_t *, uint); | 505 | void xfs_lock_two_inodes(xfs_inode_t *, xfs_inode_t *, uint); |
| 506 | 506 | ||
| 507 | void xfs_synchronize_atime(xfs_inode_t *); | 507 | void xfs_synchronize_times(xfs_inode_t *); |
| 508 | void xfs_mark_inode_dirty_sync(xfs_inode_t *); | 508 | void xfs_mark_inode_dirty_sync(xfs_inode_t *); |
| 509 | 509 | ||
| 510 | #if defined(XFS_INODE_TRACE) | 510 | #if defined(XFS_INODE_TRACE) |