forked from luck/tmp_suning_uos_patched
xfs: pass a boolean flag to xfs_trans_free_items
The flags value always was 0 or XFS_TRANS_ABORT. Switch to a bool parameter to allow further cleanups. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
parent
2e6db6c4c1
commit
eacb24e734
|
@ -809,7 +809,7 @@ xfs_log_commit_cil(
|
|||
* the log items. This affects (at least) processing of stale buffers,
|
||||
* inodes and EFIs.
|
||||
*/
|
||||
xfs_trans_free_items(tp, tp->t_commit_lsn, 0);
|
||||
xfs_trans_free_items(tp, tp->t_commit_lsn, false);
|
||||
|
||||
xlog_cil_push_background(log);
|
||||
|
||||
|
|
|
@ -744,7 +744,7 @@ void
|
|||
xfs_trans_free_items(
|
||||
struct xfs_trans *tp,
|
||||
xfs_lsn_t commit_lsn,
|
||||
int flags)
|
||||
bool abort)
|
||||
{
|
||||
struct xfs_log_item_desc *lidp, *next;
|
||||
|
||||
|
@ -755,7 +755,7 @@ xfs_trans_free_items(
|
|||
|
||||
if (commit_lsn != NULLCOMMITLSN)
|
||||
lip->li_ops->iop_committing(lip, commit_lsn);
|
||||
if (flags & XFS_TRANS_ABORT)
|
||||
if (abort)
|
||||
lip->li_flags |= XFS_LI_ABORTED;
|
||||
lip->li_ops->iop_unlock(lip);
|
||||
|
||||
|
@ -969,7 +969,7 @@ xfs_trans_commit(
|
|||
error = -EIO;
|
||||
}
|
||||
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_STATS_INC(xs_trans_empty);
|
||||
|
@ -1031,7 +1031,7 @@ xfs_trans_cancel(
|
|||
/* mark this thread as no longer being in a transaction */
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ void xfs_trans_init(struct xfs_mount *);
|
|||
void xfs_trans_add_item(struct xfs_trans *, struct xfs_log_item *);
|
||||
void xfs_trans_del_item(struct xfs_log_item *);
|
||||
void xfs_trans_free_items(struct xfs_trans *tp, xfs_lsn_t commit_lsn,
|
||||
int flags);
|
||||
bool abort);
|
||||
void xfs_trans_unreserve_and_mod_sb(struct xfs_trans *tp);
|
||||
|
||||
void xfs_trans_committed_bulk(struct xfs_ail *ailp, struct xfs_log_vec *lv,
|
||||
|
|
Loading…
Reference in New Issue
Block a user