diff options
| author | Linus Torvalds | 2009-04-03 18:52:29 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-04-03 18:52:29 +0200 |
| commit | ac7c1a776dfe1a9c83ea7885f858f5f1a144d8af (patch) | |
| tree | 4ad3158dd6dc5029a221421ae9a3c339f10c3f10 /fs/xfs/xfs_utils.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
| download | kernel-qcow2-linux-ac7c1a776dfe1a9c83ea7885f858f5f1a144d8af.tar.gz kernel-qcow2-linux-ac7c1a776dfe1a9c83ea7885f858f5f1a144d8af.tar.xz kernel-qcow2-linux-ac7c1a776dfe1a9c83ea7885f858f5f1a144d8af.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: (61 commits)
Revert "xfs: increase the maximum number of supported ACL entries"
xfs: cleanup uuid handling
xfs: remove m_attroffset
xfs: fix various typos
xfs: pagecache usage optimization
xfs: remove m_litino
xfs: kill ino64 mount option
xfs: kill mutex_t typedef
xfs: increase the maximum number of supported ACL entries
xfs: factor out code to find the longest free extent in the AG
xfs: kill VN_BAD
xfs: kill vn_atime_* helpers.
xfs: cleanup xlog_bread
xfs: cleanup xlog_recover_do_trans
xfs: remove another leftover of the old inode log item format
xfs: cleanup log unmount handling
Fix xfs debug build breakage by pushing xfs_error.h after
xfs: include header files for prototypes
xfs: make symbols static
xfs: move declaration to header file
...
Diffstat (limited to 'fs/xfs/xfs_utils.c')
| -rw-r--r-- | fs/xfs/xfs_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c index fcc2285d03ed..79b9e5ea5359 100644 --- a/fs/xfs/xfs_utils.c +++ b/fs/xfs/xfs_utils.c @@ -374,7 +374,7 @@ xfs_truncate_file( /* * Follow the normal truncate locking protocol. Since we - * hold the inode in the transaction, we know that it's number + * hold the inode in the transaction, we know that its number * of references will stay constant. */ xfs_ilock(ip, XFS_ILOCK_EXCL); |