diff options
| author | Christoph Hellwig | 2019-06-29 04:27:30 +0200 |
|---|---|---|
| committer | Darrick J. Wong | 2019-06-29 04:27:30 +0200 |
| commit | d15cbf2f38b2fbc78512561052953c94cc82a9f5 (patch) | |
| tree | 075376e4e0b309fc9231e32d03850d35b4a541b4 /fs/xfs/xfs_log.c | |
| parent | xfs: fix a trivial comment typo in xfs_trans_committed_bulk (diff) | |
| download | kernel-qcow2-linux-d15cbf2f38b2fbc78512561052953c94cc82a9f5.tar.gz kernel-qcow2-linux-d15cbf2f38b2fbc78512561052953c94cc82a9f5.tar.xz kernel-qcow2-linux-d15cbf2f38b2fbc78512561052953c94cc82a9f5.zip | |
xfs: stop using XFS_LI_ABORTED as a parameter flag
Just pass a straight bool aborted instead of abusing XFS_LI_ABORTED as a
flag in function parameters.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_log.c')
| -rw-r--r-- | fs/xfs/xfs_log.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 8a3b7ccf070a..aa2bd0847dfa 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -50,12 +50,9 @@ xlog_dealloc_log( struct xlog *log); /* local state machine functions */ -STATIC void xlog_state_done_syncing(xlog_in_core_t *iclog, int); -STATIC void -xlog_state_do_callback( - struct xlog *log, - int aborted, - struct xlog_in_core *iclog); +STATIC void xlog_state_done_syncing( + struct xlog_in_core *iclog, + bool aborted); STATIC int xlog_state_get_iclog_space( struct xlog *log, @@ -1246,7 +1243,7 @@ xlog_ioend_work( struct xlog_in_core *iclog = container_of(work, struct xlog_in_core, ic_end_io_work); struct xlog *log = iclog->ic_log; - int aborted = 0; + bool aborted = false; int error; error = blk_status_to_errno(iclog->ic_bio.bi_status); @@ -1267,9 +1264,9 @@ xlog_ioend_work( * callback routines to let them know that the log-commit * didn't succeed. */ - aborted = XFS_LI_ABORTED; + aborted = true; } else if (iclog->ic_state & XLOG_STATE_IOERROR) { - aborted = XFS_LI_ABORTED; + aborted = true; } xlog_state_done_syncing(iclog, aborted); @@ -2645,7 +2642,7 @@ xlog_get_lowest_lsn( STATIC void xlog_state_do_callback( struct xlog *log, - int aborted, + bool aborted, struct xlog_in_core *ciclog) { xlog_in_core_t *iclog; @@ -2884,10 +2881,10 @@ xlog_state_do_callback( */ STATIC void xlog_state_done_syncing( - xlog_in_core_t *iclog, - int aborted) + struct xlog_in_core *iclog, + bool aborted) { - struct xlog *log = iclog->ic_log; + struct xlog *log = iclog->ic_log; spin_lock(&log->l_icloglock); @@ -3966,7 +3963,7 @@ xfs_log_force_umount( * avoid races. */ wake_up_all(&log->l_cilp->xc_commit_wait); - xlog_state_do_callback(log, XFS_LI_ABORTED, NULL); + xlog_state_do_callback(log, true, NULL); #ifdef XFSERRORDEBUG { |