[XFS] Cancel transactions on xfs_itruncate_start error.

SGI-PV: 966502
SGI-Modid: xfs-linux-melb:xfs-kern:28943a

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 8c830a48165a..5dbca95598e0 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -1263,6 +1263,7 @@ xfs_free_eofblocks(
                 error = xfs_itruncate_start(ip, XFS_ITRUNC_DEFINITE,
                                     ip->i_size);
                 if (error) {
+                        xfs_trans_cancel(tp, 0);
                         if (use_iolock)
                                 xfs_iunlock(ip, XFS_IOLOCK_EXCL);
                         return error;
@@ -1687,6 +1688,7 @@ xfs_inactive(
 
                 error = xfs_itruncate_start(ip, XFS_ITRUNC_DEFINITE, 0);
                 if (error) {
+                        xfs_trans_cancel(tp, 0);
                         xfs_iunlock(ip, XFS_IOLOCK_EXCL);
                         return VN_INACTIVE_CACHE;
                 }