Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / fs / xfs / xfs_inode.c

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index a37480a..c8e3349 100644 (file)
--- 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,
@@ -1470,7 +1470,7 @@ xfs_itruncate_finish(
         * file but the log buffers containing the free and reallocation
         * don't, then we'd end up with garbage in the blocks being freed.
         * As long as we make the new_size permanent before actually
-        * freeing any blocks it doesn't matter if they get writtten to.
+        * freeing any blocks it doesn't matter if they get written to.
         *
         * The callers must signal into us whether or not the size
         * setting here must be synchronous.  There are a few cases