|
@@ -744,7 +744,7 @@ void
|
|
xfs_trans_free_items(
|
|
xfs_trans_free_items(
|
|
struct xfs_trans *tp,
|
|
struct xfs_trans *tp,
|
|
xfs_lsn_t commit_lsn,
|
|
xfs_lsn_t commit_lsn,
|
|
- int flags)
|
|
|
|
|
|
+ bool abort)
|
|
{
|
|
{
|
|
struct xfs_log_item_desc *lidp, *next;
|
|
struct xfs_log_item_desc *lidp, *next;
|
|
|
|
|
|
@@ -755,7 +755,7 @@ xfs_trans_free_items(
|
|
|
|
|
|
if (commit_lsn != NULLCOMMITLSN)
|
|
if (commit_lsn != NULLCOMMITLSN)
|
|
lip->li_ops->iop_committing(lip, commit_lsn);
|
|
lip->li_ops->iop_committing(lip, commit_lsn);
|
|
- if (flags & XFS_TRANS_ABORT)
|
|
|
|
|
|
+ if (abort)
|
|
lip->li_flags |= XFS_LI_ABORTED;
|
|
lip->li_flags |= XFS_LI_ABORTED;
|
|
lip->li_ops->iop_unlock(lip);
|
|
lip->li_ops->iop_unlock(lip);
|
|
|
|
|
|
@@ -969,7 +969,7 @@ out_unreserve:
|
|
error = -EIO;
|
|
error = -EIO;
|
|
}
|
|
}
|
|
current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
|
|
current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
|
|
- xfs_trans_free_items(tp, NULLCOMMITLSN, error ? XFS_TRANS_ABORT : 0);
|
|
|
|
|
|
+ xfs_trans_free_items(tp, NULLCOMMITLSN, !!error);
|
|
xfs_trans_free(tp);
|
|
xfs_trans_free(tp);
|
|
|
|
|
|
XFS_STATS_INC(xs_trans_empty);
|
|
XFS_STATS_INC(xs_trans_empty);
|
|
@@ -1031,7 +1031,7 @@ xfs_trans_cancel(
|
|
/* mark this thread as no longer being in a transaction */
|
|
/* mark this thread as no longer being in a transaction */
|
|
current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
|
|
current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);
|
|
|
|
|
|
- xfs_trans_free_items(tp, NULLCOMMITLSN, flags);
|
|
|
|
|
|
+ xfs_trans_free_items(tp, NULLCOMMITLSN, flags & XFS_TRANS_ABORT);
|
|
xfs_trans_free(tp);
|
|
xfs_trans_free(tp);
|
|
}
|
|
}
|
|
|
|
|