Commit f10e925d authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: merge xlog_commit_record with xlog_write_done 



xlog_write_done() is just a thin wrapper around xlog_commit_record(), so
they can be merged together easily.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 8b41e3f9

fs/xfs/xfs_log.c

+10 −33
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ 
kmem_zone_t	*xfs_log_ticket_zone;



/* Local miscellaneous function prototypes */

STATIC int

xlog_commit_record(

	struct xlog		*log,

	struct xlog_ticket	*ticket,

	struct xlog_in_core	**iclog,

	xfs_lsn_t		*commitlsnp);



STATIC struct xlog *

xlog_alloc_log(

	struct xfs_mount	*mp,
@@ -478,22 +471,6 @@ out_error: 
 *		marked as with WANT_SYNC.

 */



/*

 * Write a commit record to the log to close off a running log write.

 */

int

xlog_write_done(

	struct xlog		*log,

	struct xlog_ticket	*ticket,

	struct xlog_in_core	**iclog,

	xfs_lsn_t		*lsn)

{

	if (XLOG_FORCED_SHUTDOWN(log))

		return -EIO;



	return xlog_commit_record(log, ticket, iclog, lsn);

}



static bool

__xlog_state_release_iclog(

	struct xlog		*log,
@@ -1463,20 +1440,17 @@ out: 
	return ERR_PTR(error);

}	/* xlog_alloc_log */





/*

 * Write out the commit record of a transaction associated with the given

 * ticket.  Return the lsn of the commit record.

 * ticket to close off a running log write. Return the lsn of the commit record.

 */

STATIC int

int

xlog_commit_record(

	struct xlog		*log,

	struct xlog_ticket	*ticket,

	struct xlog_in_core	**iclog,

	xfs_lsn_t		*commitlsnp)

	xfs_lsn_t		*lsn)

{

	struct xfs_mount *mp = log->l_mp;

	int	error;

	struct xfs_log_iovec reg = {

		.i_addr = NULL,

		.i_len = 0,
@@ -1486,12 +1460,15 @@ xlog_commit_record( 
		.lv_niovecs = 1,

		.lv_iovecp = &reg,

	};

	int	error;



	ASSERT_ALWAYS(iclog);

	error = xlog_write(log, &vec, ticket, commitlsnp, iclog,

					XLOG_COMMIT_TRANS, false);

	if (XLOG_FORCED_SHUTDOWN(log))

		return -EIO;



	error = xlog_write(log, &vec, ticket, lsn, iclog, XLOG_COMMIT_TRANS,

			   false);

	if (error)

		xfs_force_shutdown(mp, SHUTDOWN_LOG_IO_ERROR);

		xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);

	return error;

}

fs/xfs/xfs_log_cil.c

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ restart: 
	}

	spin_unlock(&cil->xc_push_lock);



	error = xlog_write_done(log, tic, &commit_iclog, &commit_lsn);

	error = xlog_commit_record(log, tic, &commit_iclog, &commit_lsn);

	if (error)

		goto out_abort_free_ticket;

fs/xfs/xfs_log_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ int xlog_write(struct xlog *log, struct xfs_log_vec *log_vector, 
		struct xlog_ticket *tic, xfs_lsn_t *start_lsn,

		struct xlog_in_core **commit_iclog, uint flags,

		bool need_start_rec);

int	xlog_write_done(struct xlog *log, struct xlog_ticket *ticket,

int	xlog_commit_record(struct xlog *log, struct xlog_ticket *ticket,

		struct xlog_in_core **iclog, xfs_lsn_t *lsn);

void	xfs_log_ticket_ungrant(struct xlog *log, struct xlog_ticket *ticket);

void	xfs_log_ticket_regrant(struct xlog *log, struct xlog_ticket *ticket);

CRA Git | Maintained and supported by SUSTech CRA and CCSE