diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 15:19:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 15:19:16 -0700 |
| commit | a77febbef105554c5a37241cf903f48ab7bc03c7 (patch) | |
| tree | d6f96d9d5837312ce6dc2db9f3fc93a243eec87b /fs/xfs/xfs_inode.c | |
| parent | 42cd71bf1e3a081b3150018bbf448cb6c8a844a5 (diff) | |
| parent | bf59170a66bc3eaf3ee513aa6ce9774aa2ab5188 (diff) | |
| download | kernel_samsung_smdk4412-a77febbef105554c5a37241cf903f48ab7bc03c7.zip kernel_samsung_smdk4412-a77febbef105554c5a37241cf903f48ab7bc03c7.tar.gz kernel_samsung_smdk4412-a77febbef105554c5a37241cf903f48ab7bc03c7.tar.bz2 | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: obey minleft values during extent allocation correctly
xfs: reset buffer pointers before freeing them
xfs: avoid getting stuck during async inode flushes
xfs: fix xfs_itruncate_start tracing
xfs: fix duplicate workqueue initialisation
xfs: kill off xfs_printk()
xfs: fix race condition in AIL push trigger
xfs: make AIL target updates and compares 32bit safe.
xfs: always push the AIL to the target
xfs: exit AIL push work correctly when AIL is empty
xfs: ensure reclaim cursor is reset correctly at end of AG
xfs: add an x86 compat handler for XFS_IOC_ZERO_RANGE
xfs: fix compiler warning in xfs_trace.h
xfs: cleanup duplicate initializations
xfs: reduce the number of pagb_lock roundtrips in xfs_alloc_clear_busy
xfs: exact busy extent tracking
xfs: do not immediately reuse busy extent ranges
xfs: optimize AGFL refills
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index d11ce61..c8e3349 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1354,7 +1354,7 @@ xfs_itruncate_start( return 0; } last_byte = xfs_file_last_byte(ip); - trace_xfs_itruncate_start(ip, flags, new_size, toss_start, last_byte); + trace_xfs_itruncate_start(ip, new_size, flags, toss_start, last_byte); if (last_byte > toss_start) { if (flags & XFS_ITRUNC_DEFINITE) { xfs_tosspages(ip, toss_start, |