On Wed, May 19, 2021 at 10:13:02PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> So remove it from the interface and callers.
>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
Looks pretty straightforward.
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_log.c | 14 ++++----------
> fs/xfs/xfs_log_cil.c | 2 +-
> fs/xfs/xfs_log_priv.h | 2 +-
> 3 files changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index 574078985f0a..65b28fce4db4 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -863,8 +863,7 @@ xlog_write_unmount_record(
> */
> if (log->l_targ != log->l_mp->m_ddev_targp)
> blkdev_issue_flush(log->l_targ->bt_bdev);
> - return xlog_write(log, &vec, ticket, NULL, NULL, XLOG_UNMOUNT_TRANS,
> - reg.i_len);
> + return xlog_write(log, &vec, ticket, NULL, NULL, reg.i_len);
> }
>
> /*
> @@ -1588,8 +1587,7 @@ xlog_commit_record(
>
> /* account for space used by record data */
> ticket->t_curr_res -= reg.i_len;
> - error = xlog_write(log, &vec, ticket, lsn, iclog, XLOG_COMMIT_TRANS,
> - reg.i_len);
> + error = xlog_write(log, &vec, ticket, lsn, iclog, reg.i_len);
> if (error)
> xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);
> return error;
> @@ -2399,7 +2397,6 @@ xlog_write(
> struct xlog_ticket *ticket,
> xfs_lsn_t *start_lsn,
> struct xlog_in_core **commit_iclog,
> - uint optype,
> uint32_t len)
> {
> struct xlog_in_core *iclog = NULL;
> @@ -2431,7 +2428,6 @@ xlog_write(
> if (!lv)
> break;
>
> - ASSERT(!(optype & (XLOG_COMMIT_TRANS | XLOG_UNMOUNT_TRANS)));
> lv = xlog_write_partial(log, lv, ticket, &iclog, &log_offset,
> &len, &record_cnt, &data_cnt);
> if (IS_ERR_OR_NULL(lv)) {
> @@ -2449,12 +2445,10 @@ xlog_write(
> */
> spin_lock(&log->l_icloglock);
> xlog_state_finish_copy(log, iclog, record_cnt, 0);
> - if (commit_iclog) {
> - ASSERT(optype & XLOG_COMMIT_TRANS);
> + if (commit_iclog)
> *commit_iclog = iclog;
> - } else {
> + else
> error = xlog_state_release_iclog(log, iclog);
> - }
> spin_unlock(&log->l_icloglock);
>
> return error;
> diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
> index 7a6b80666f98..dbe3a8267e2f 100644
> --- a/fs/xfs/xfs_log_cil.c
> +++ b/fs/xfs/xfs_log_cil.c
> @@ -908,7 +908,7 @@ xlog_cil_push_work(
> * write head.
> */
> error = xlog_write(log, &lvhdr, ctx->ticket, &ctx->start_lsn, NULL,
> - XLOG_START_TRANS, num_bytes);
> + num_bytes);
> if (error)
> goto out_abort_free_ticket;
>
> diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
> index eba905c273b0..a16ffdc8ae97 100644
> --- a/fs/xfs/xfs_log_priv.h
> +++ b/fs/xfs/xfs_log_priv.h
> @@ -459,7 +459,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_log_vec *log_vector,
> struct xlog_ticket *tic, xfs_lsn_t *start_lsn,
> - struct xlog_in_core **commit_iclog, uint optype, uint32_t len);
> + struct xlog_in_core **commit_iclog, uint32_t len);
> int xlog_commit_record(struct xlog *log, struct xlog_ticket *ticket,
> struct xlog_in_core **iclog, xfs_lsn_t *lsn);
>
> --
> 2.31.1
>
