diff options
| author |   Brian Foster <bfoster@redhat.com> | 2018-09-29 13:41:58 +1000 |
|---|---|---|
| committer |   Dave Chinner <david@fromorbit.com> | 2018-09-29 13:41:58 +1000 |
| commit | d5a2e2893da0d62c3888c91ae2da798adc17a9b9 (patch) | |
| tree | db2dcdff07f1ca24be625bb8b1e727b8d8f02547 /fs/xfs/xfs_inode.c | |
| parent | xfs: don't crash the vfs on a garbage inline symlink (diff) | |
| download | linux-dev-d5a2e2893da0d62c3888c91ae2da798adc17a9b9.tar.xz linux-dev-d5a2e2893da0d62c3888c91ae2da798adc17a9b9.zip | |
xfs: remove last of unnecessary xfs_defer_cancel() callers
Now that deferred operations are completely managed via
transactions, it's no longer necessary to cancel the dfops in error
paths that already cancel the associated transaction. There are a
few such calls lingering throughout the codebase.
Remove all remaining unnecessary calls to xfs_defer_cancel(). This
leaves xfs_defer_cancel() calls in two places. The first is the call
in the transaction cancel path itself, which facilitates this patch.
The second is made via the xfs_defer_finish() error path to provide
consistent error semantics with transaction commit. For example,
xfs_trans_commit() expects an xfs_defer_finish() failure to clean up
the dfops structure before it returns.
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to '')
| -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( error = xfs_bunmapi(tp, ip, first_unmap_block, unmap_len, flags, XFS_ITRUNC_MAX_EXTENTS, &done); if (error) - goto out_bmap_cancel; + goto out; /* * Duplicate the transaction that has the permanent @@ -1599,14 +1599,6 @@ xfs_itruncate_extents_flags( out: *tpp = tp; return error; -out_bmap_cancel: - /* - * If the bunmapi call encounters an error, return to the caller where - * the transaction can be properly aborted. We just need to make sure - * we're not holding any resources that we were not when we came in. - */ - xfs_defer_cancel(tp); - goto out; } int |