Commit 14b07ecd authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: xlog_write() doesn't need optype anymore 



So remove it from the interface and callers.

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>
Reviewed-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent be8ddda5

fs/xfs/xfs_log.c

+1 −3
Original line number Diff line number Diff line
@@ -952,8 +952,7 @@ xlog_write_unmount_record( 
	/* account for space used by record data */

	ticket->t_curr_res -= sizeof(unmount_rec);



	return xlog_write(log, NULL, &vec, ticket, XLOG_UNMOUNT_TRANS,

			reg.i_len);

	return xlog_write(log, NULL, &vec, ticket, reg.i_len);

}



/*
@@ -2469,7 +2468,6 @@ xlog_write( 
	struct xfs_cil_ctx	*ctx,

	struct xfs_log_vec	*log_vector,

	struct xlog_ticket	*ticket,

	uint			optype,

	uint32_t		len)



{

fs/xfs/xfs_log_cil.c

+2 −4
Original line number Diff line number Diff line
@@ -834,8 +834,7 @@ xlog_cil_write_chain( 
	error = xlog_cil_order_write(ctx->cil, ctx->sequence, _START_RECORD);

	if (error)

		return error;

	return xlog_write(log, ctx, chain, ctx->ticket, XLOG_START_TRANS,

			chain_len);

	return xlog_write(log, ctx, chain, ctx->ticket, chain_len);

}



/*
@@ -874,8 +873,7 @@ xlog_cil_write_commit_record( 


	/* account for space used by record data */

	ctx->ticket->t_curr_res -= reg.i_len;

	error = xlog_write(log, ctx, &vec, ctx->ticket, XLOG_COMMIT_TRANS,

			reg.i_len);

	error = xlog_write(log, ctx, &vec, ctx->ticket, reg.i_len);

	if (error)

		xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR);

	return error;

fs/xfs/xfs_log_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ void xlog_print_tic_res(struct xfs_mount *mp, struct xlog_ticket *ticket); 
void	xlog_print_trans(struct xfs_trans *);

int	xlog_write(struct xlog *log, struct xfs_cil_ctx *ctx,

		struct xfs_log_vec *log_vector, struct xlog_ticket *tic,

		uint optype, uint32_t len);

		uint32_t len);

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

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