Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6f97264 authored by Jie Liu's avatar Jie Liu Committed by Dave Chinner
Browse files

xfs: convert xfs_log_commit_cil() to void 



Convert xfs_log_commit_cil() to a void function since it return nothing
but 0 in any case, after that we can simplify the relative code logic
in xfs_trans_commit() accordingly.

Signed-off-by: default avatarJie Liu <jeff.liu@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 410b11a6

fs/xfs/xfs_log.h

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ void xlog_iodone(struct xfs_buf *); 
struct xlog_ticket *xfs_log_ticket_get(struct xlog_ticket *ticket);

void	  xfs_log_ticket_put(struct xlog_ticket *ticket);



int	xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,

void	xfs_log_commit_cil(struct xfs_mount *mp, struct xfs_trans *tp,

				xfs_lsn_t *commit_lsn, int flags);

bool	xfs_log_item_in_current_chkpt(struct xfs_log_item *lip);

fs/xfs/xfs_log_cil.c

+1 −2
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ xlog_cil_empty( 
 * background commit, returns without it held once background commits are

 * allowed again.

 */

int

void

xfs_log_commit_cil(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,
@@ -756,7 +756,6 @@ xfs_log_commit_cil( 
	xlog_cil_push_background(log);



	up_read(&cil->xc_ctx_lock);

	return 0;

}



/*

fs/xfs/xfs_trans.c

+2 −10
Original line number Diff line number Diff line
@@ -887,12 +887,7 @@ xfs_trans_commit( 
		xfs_trans_apply_sb_deltas(tp);

	xfs_trans_apply_dquot_deltas(tp);



	error = xfs_log_commit_cil(mp, tp, &commit_lsn, flags);

	if (error == ENOMEM) {

		xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR);

		error = XFS_ERROR(EIO);

		goto out_unreserve;

	}

	xfs_log_commit_cil(mp, tp, &commit_lsn, flags);



	current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS);

	xfs_trans_free(tp);
@@ -902,10 +897,7 @@ xfs_trans_commit( 
	 * log out now and wait for it.

	 */

	if (sync) {

		if (!error) {

			error = _xfs_log_force_lsn(mp, commit_lsn,

				      XFS_LOG_SYNC, NULL);

		}

		error = _xfs_log_force_lsn(mp, commit_lsn, XFS_LOG_SYNC, NULL);

		XFS_STATS_INC(xs_trans_sync);

	} else {

		XFS_STATS_INC(xs_trans_async);