diff options
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r-- | fs/xfs/xfs_inode.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index d957a46dc1cb..05db9540e459 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -1563,7 +1563,7 @@ xfs_itruncate_extents_flags( | |||
1563 | error = xfs_bunmapi(tp, ip, first_unmap_block, unmap_len, flags, | 1563 | error = xfs_bunmapi(tp, ip, first_unmap_block, unmap_len, flags, |
1564 | XFS_ITRUNC_MAX_EXTENTS, &done); | 1564 | XFS_ITRUNC_MAX_EXTENTS, &done); |
1565 | if (error) | 1565 | if (error) |
1566 | goto out_bmap_cancel; | 1566 | goto out; |
1567 | 1567 | ||
1568 | /* | 1568 | /* |
1569 | * Duplicate the transaction that has the permanent | 1569 | * Duplicate the transaction that has the permanent |
@@ -1599,14 +1599,6 @@ xfs_itruncate_extents_flags( | |||
1599 | out: | 1599 | out: |
1600 | *tpp = tp; | 1600 | *tpp = tp; |
1601 | return error; | 1601 | return error; |
1602 | out_bmap_cancel: | ||
1603 | /* | ||
1604 | * If the bunmapi call encounters an error, return to the caller where | ||
1605 | * the transaction can be properly aborted. We just need to make sure | ||
1606 | * we're not holding any resources that we were not when we came in. | ||
1607 | */ | ||
1608 | xfs_defer_cancel(tp); | ||
1609 | goto out; | ||
1610 | } | 1602 | } |
1611 | 1603 | ||
1612 | int | 1604 | int |