Skip to content

Commit 14b07ec

Browse files
dgchinnerdchinner
authored andcommitted
xfs: xlog_write() doesn't need optype anymore
So remove it from the interface and callers. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chandan Babu R <chandan.babu@oracle.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
1 parent be8ddda commit 14b07ec

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

fs/xfs/xfs_log.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,8 +952,7 @@ xlog_write_unmount_record(
952952
/* account for space used by record data */
953953
ticket->t_curr_res -= sizeof(unmount_rec);
954954

955-
return xlog_write(log, NULL, &vec, ticket, XLOG_UNMOUNT_TRANS,
956-
reg.i_len);
955+
return xlog_write(log, NULL, &vec, ticket, reg.i_len);
957956
}
958957

959958
/*
@@ -2469,7 +2468,6 @@ xlog_write(
24692468
struct xfs_cil_ctx *ctx,
24702469
struct xfs_log_vec *log_vector,
24712470
struct xlog_ticket *ticket,
2472-
uint optype,
24732471
uint32_t len)
24742472

24752473
{

fs/xfs/xfs_log_cil.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -834,8 +834,7 @@ xlog_cil_write_chain(
834834
error = xlog_cil_order_write(ctx->cil, ctx->sequence, _START_RECORD);
835835
if (error)
836836
return error;
837-
return xlog_write(log, ctx, chain, ctx->ticket, XLOG_START_TRANS,
838-
chain_len);
837+
return xlog_write(log, ctx, chain, ctx->ticket, chain_len);
839838
}
840839

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

875874
/* account for space used by record data */
876875
ctx->ticket->t_curr_res -= reg.i_len;
877-
error = xlog_write(log, ctx, &vec, ctx->ticket, XLOG_COMMIT_TRANS,
878-
reg.i_len);
876+
error = xlog_write(log, ctx, &vec, ctx->ticket, reg.i_len);
879877
if (error)
880878
xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR);
881879
return error;

fs/xfs/xfs_log_priv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ void xlog_print_tic_res(struct xfs_mount *mp, struct xlog_ticket *ticket);
491491
void xlog_print_trans(struct xfs_trans *);
492492
int xlog_write(struct xlog *log, struct xfs_cil_ctx *ctx,
493493
struct xfs_log_vec *log_vector, struct xlog_ticket *tic,
494-
uint optype, uint32_t len);
494+
uint32_t len);
495495
void xfs_log_ticket_ungrant(struct xlog *log, struct xlog_ticket *ticket);
496496
void xfs_log_ticket_regrant(struct xlog *log, struct xlog_ticket *ticket);
497497

0 commit comments

Comments
 (0)