| Message ID | 20211118231352.2051947-16-david@fromorbit.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
| Series | xfs: rework xlog_write() | expand |
On 19 Nov 2021 at 04:43, Dave Chinner wrote: > From: Dave Chinner <dchinner@redhat.com> > > So remove it from the interface and callers. > Looks good. Reviewed-by: Chandan Babu R <chandan.babu@oracle.com> > Signed-off-by: Dave Chinner <dchinner@redhat.com> > Reviewed-by: Darrick J. Wong <djwong@kernel.org> > Reviewed-by: Christoph Hellwig <hch@lst.de> > --- > fs/xfs/xfs_log.c | 4 +--- > fs/xfs/xfs_log_cil.c | 6 ++---- > fs/xfs/xfs_log_priv.h | 2 +- > 3 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c > index da660e09aa5c..9a49acd94516 100644 > --- a/fs/xfs/xfs_log.c > +++ b/fs/xfs/xfs_log.c > @@ -966,8 +966,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); > } > > /* > @@ -2483,7 +2482,6 @@ xlog_write( > struct xfs_cil_ctx *ctx, > struct xfs_log_vec *log_vector, > struct xlog_ticket *ticket, > - uint optype, > uint32_t len) > > { > diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c > index 99ef13f1b248..ad98e4df0e2c 100644 > --- a/fs/xfs/xfs_log_cil.c > +++ b/fs/xfs/xfs_log_cil.c > @@ -800,8 +800,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); > } > > /* > @@ -840,8 +839,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) > xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR); > return error; > diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h > index 8c98b57e2a63..3008c0c884c7 100644 > --- a/fs/xfs/xfs_log_priv.h > +++ b/fs/xfs/xfs_log_priv.h > @@ -480,7 +480,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);
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index da660e09aa5c..9a49acd94516 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -966,8 +966,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); } /* @@ -2483,7 +2482,6 @@ xlog_write( struct xfs_cil_ctx *ctx, struct xfs_log_vec *log_vector, struct xlog_ticket *ticket, - uint optype, uint32_t len) { diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c index 99ef13f1b248..ad98e4df0e2c 100644 --- a/fs/xfs/xfs_log_cil.c +++ b/fs/xfs/xfs_log_cil.c @@ -800,8 +800,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); } /* @@ -840,8 +839,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) xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR); return error; diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index 8c98b57e2a63..3008c0c884c7 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h @@ -480,7 +480,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);