Commit 87ae3c24 authored by Jesper Juhl's avatar Jesper Juhl Committed by Tim Shimmin

[XFS] Cancel transactions on xfs_itruncate_start error.

SGI-PV: 966502
SGI-Modid: xfs-linux-melb:xfs-kern:28943a
Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 39726be2
...@@ -1263,6 +1263,7 @@ xfs_free_eofblocks( ...@@ -1263,6 +1263,7 @@ xfs_free_eofblocks(
error = xfs_itruncate_start(ip, XFS_ITRUNC_DEFINITE, error = xfs_itruncate_start(ip, XFS_ITRUNC_DEFINITE,
ip->i_size); ip->i_size);
if (error) { if (error) {
xfs_trans_cancel(tp, 0);
if (use_iolock) if (use_iolock)
xfs_iunlock(ip, XFS_IOLOCK_EXCL); xfs_iunlock(ip, XFS_IOLOCK_EXCL);
return error; return error;
...@@ -1687,6 +1688,7 @@ xfs_inactive( ...@@ -1687,6 +1688,7 @@ xfs_inactive(
error = xfs_itruncate_start(ip, XFS_ITRUNC_DEFINITE, 0); error = xfs_itruncate_start(ip, XFS_ITRUNC_DEFINITE, 0);
if (error) { if (error) {
xfs_trans_cancel(tp, 0);
xfs_iunlock(ip, XFS_IOLOCK_EXCL); xfs_iunlock(ip, XFS_IOLOCK_EXCL);
return VN_INACTIVE_CACHE; return VN_INACTIVE_CACHE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment