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

xfs: move xlog_commit_record to xfs_log_cil.c 



It is only used by the CIL checkpoints, and is the counterpart to
start record formatting and writing that is already local to
xfs_log_cil.c.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 2562c322

fs/xfs/xfs_log.c

+0 −31
Original line number Diff line number Diff line
@@ -1658,37 +1658,6 @@ xlog_alloc_log( 
	return ERR_PTR(error);

}	/* xlog_alloc_log */



/*

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

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

 */

int

xlog_commit_record(

	struct xlog		*log,

	struct xlog_ticket	*ticket,

	struct xlog_in_core	**iclog,

	xfs_lsn_t		*lsn)

{

	struct xfs_log_iovec reg = {

		.i_addr = NULL,

		.i_len = 0,

		.i_type = XLOG_REG_TYPE_COMMIT,

	};

	struct xfs_log_vec vec = {

		.lv_niovecs = 1,

		.lv_iovecp = &reg,

	};

	int	error;



	if (xlog_is_shutdown(log))

		return -EIO;



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

	if (error)

		xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);

	return error;

}



/*

 * Compute the LSN that we'd need to push the log tail towards in order to have

 * (a) enough on-disk log space to log the number of bytes specified, (b) at

fs/xfs/xfs_log_cil.c

+34 −1
Original line number Diff line number Diff line
@@ -631,6 +631,38 @@ xlog_cil_process_committed( 
	}

}



/*

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

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

 * record.

 */

static int

xlog_cil_write_commit_record(

	struct xlog		*log,

	struct xlog_ticket	*ticket,

	struct xlog_in_core	**iclog,

	xfs_lsn_t		*lsn)

{

	struct xfs_log_iovec reg = {

		.i_addr = NULL,

		.i_len = 0,

		.i_type = XLOG_REG_TYPE_COMMIT,

	};

	struct xfs_log_vec vec = {

		.lv_niovecs = 1,

		.lv_iovecp = &reg,

	};

	int	error;



	if (xlog_is_shutdown(log))

		return -EIO;



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

	if (error)

		xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);

	return error;

}



/*

 * Push the Committed Item List to the log.

 *
@@ -884,7 +916,8 @@ xlog_cil_push_work( 
	}

	spin_unlock(&cil->xc_push_lock);



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

	error = xlog_cil_write_commit_record(log, tic, &commit_iclog,

			&commit_lsn);

	if (error)

		goto out_abort_free_ticket;

fs/xfs/xfs_log_priv.h

+0 −2
Original line number Diff line number Diff line
@@ -515,8 +515,6 @@ void xlog_print_trans(struct xfs_trans *); 
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 optype);

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);