From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 3/8] xfs: move xlog_commit_record to xfs_log_cil.c
Date: Thu, 17 Jun 2021 10:50:39 -0700 [thread overview]
Message-ID: <20210617175039.GU158209@locust> (raw)
In-Reply-To: <20210617082617.971602-4-david@fromorbit.com>
On Thu, Jun 17, 2021 at 06:26:12PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> 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: Dave Chinner <dchinner@redhat.com>
> ---
> fs/xfs/xfs_log.c | 41 ---------------------------------------
> fs/xfs/xfs_log_cil.c | 45 ++++++++++++++++++++++++++++++++++++++++++-
> fs/xfs/xfs_log_priv.h | 2 --
> 3 files changed, 44 insertions(+), 44 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index 54fd6a695bb5..cf661c155786 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -1563,47 +1563,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 xlog_op_header ophdr = {
> - .oh_clientid = XFS_TRANSACTION,
> - .oh_tid = cpu_to_be32(ticket->t_tid),
> - .oh_flags = XLOG_COMMIT_TRANS,
> - };
> - struct xfs_log_iovec reg = {
> - .i_addr = &ophdr,
> - .i_len = sizeof(struct xlog_op_header),
> - .i_type = XLOG_REG_TYPE_COMMIT,
> - };
> - struct xfs_log_vec vec = {
> - .lv_niovecs = 1,
> - .lv_iovecp = ®,
> - };
> - int error;
> - LIST_HEAD(lv_chain);
> - INIT_LIST_HEAD(&vec.lv_list);
> - list_add(&vec.lv_list, &lv_chain);
> -
> - if (XLOG_FORCED_SHUTDOWN(log))
> - return -EIO;
> -
> - /* account for space used by record data */
> - ticket->t_curr_res -= reg.i_len;
> - error = xlog_write(log, &lv_chain, ticket, lsn, iclog, reg.i_len);
> - 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
> diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
> index 2fb0ab02dda3..2c8b25888c53 100644
> --- a/fs/xfs/xfs_log_cil.c
> +++ b/fs/xfs/xfs_log_cil.c
> @@ -783,6 +783,48 @@ xlog_cil_build_trans_hdr(
> tic->t_curr_res -= lvhdr->lv_bytes;
> }
>
> +/*
> + * 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.
> + */
> +int
static int, like the robot suggests?
With that fixed,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> +xlog_cil_write_commit_record(
> + struct xlog *log,
> + struct xlog_ticket *ticket,
> + struct xlog_in_core **iclog,
> + xfs_lsn_t *lsn)
> +{
> + struct xlog_op_header ophdr = {
> + .oh_clientid = XFS_TRANSACTION,
> + .oh_tid = cpu_to_be32(ticket->t_tid),
> + .oh_flags = XLOG_COMMIT_TRANS,
> + };
> + struct xfs_log_iovec reg = {
> + .i_addr = &ophdr,
> + .i_len = sizeof(struct xlog_op_header),
> + .i_type = XLOG_REG_TYPE_COMMIT,
> + };
> + struct xfs_log_vec vec = {
> + .lv_niovecs = 1,
> + .lv_iovecp = ®,
> + };
> + int error;
> + LIST_HEAD(lv_chain);
> + INIT_LIST_HEAD(&vec.lv_list);
> + list_add(&vec.lv_list, &lv_chain);
> +
> + if (XLOG_FORCED_SHUTDOWN(log))
> + return -EIO;
> +
> + /* account for space used by record data */
> + ticket->t_curr_res -= reg.i_len;
> + error = xlog_write(log, &lv_chain, ticket, lsn, iclog, reg.i_len);
> + if (error)
> + xfs_force_shutdown(log->l_mp, SHUTDOWN_LOG_IO_ERROR);
> + return error;
> +}
> +
> /*
> * CIL item reordering compare function. We want to order in ascending ID order,
> * but we want to leave items with the same ID in the order they were added to
> @@ -1041,7 +1083,8 @@ xlog_cil_push_work(
> }
> spin_unlock(&cil->xc_push_lock);
>
> - error = xlog_commit_record(log, ctx->ticket, &commit_iclog, &commit_lsn);
> + error = xlog_cil_write_commit_record(log, ctx->ticket, &commit_iclog,
> + &commit_lsn);
> if (error)
> goto out_abort_free_ticket;
>
> diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
> index 330befd9f6be..26f26769d1c6 100644
> --- a/fs/xfs/xfs_log_priv.h
> +++ b/fs/xfs/xfs_log_priv.h
> @@ -490,8 +490,6 @@ void xlog_print_trans(struct xfs_trans *);
> int xlog_write(struct xlog *log, struct list_head *lv_chain,
> struct xlog_ticket *tic, xfs_lsn_t *start_lsn,
> 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);
>
> void xfs_log_ticket_ungrant(struct xlog *log, struct xlog_ticket *ticket);
> void xfs_log_ticket_regrant(struct xlog *log, struct xlog_ticket *ticket);
> --
> 2.31.1
>
next prev parent reply other threads:[~2021-06-17 17:50 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 8:26 [PATCH 0/8 V2] xfs: log fixes for for-next Dave Chinner
2021-06-17 8:26 ` [PATCH 1/8] xfs: add iclog state trace events Dave Chinner
2021-06-17 16:45 ` Darrick J. Wong
2021-06-18 14:09 ` Christoph Hellwig
2021-06-17 8:26 ` [PATCH 2/8] xfs: don't wait on future iclogs when pushing the CIL Dave Chinner
2021-06-17 17:49 ` Darrick J. Wong
2021-06-17 21:55 ` Dave Chinner
2021-06-17 8:26 ` [PATCH 3/8] xfs: move xlog_commit_record to xfs_log_cil.c Dave Chinner
2021-06-17 12:57 ` kernel test robot
2021-06-17 12:57 ` kernel test robot
2021-06-17 17:50 ` Darrick J. Wong [this message]
2021-06-17 21:56 ` Dave Chinner
2021-06-18 14:16 ` Christoph Hellwig
2021-06-17 8:26 ` [PATCH 4/8] xfs: pass a CIL context to xlog_write() Dave Chinner
2021-06-17 14:46 ` kernel test robot
2021-06-17 14:46 ` kernel test robot
2021-06-17 20:24 ` Darrick J. Wong
2021-06-17 22:03 ` Dave Chinner
2021-06-17 22:18 ` Darrick J. Wong
2021-06-18 14:23 ` Christoph Hellwig
2021-06-17 8:26 ` [PATCH 5/8] xfs: factor out log write ordering from xlog_cil_push_work() Dave Chinner
2021-06-17 19:59 ` Darrick J. Wong
2021-06-18 14:27 ` Christoph Hellwig
2021-06-18 22:34 ` Dave Chinner
2021-06-17 8:26 ` [PATCH 6/8] xfs: separate out setting CIL context LSNs from xlog_write Dave Chinner
2021-06-17 20:28 ` Darrick J. Wong
2021-06-17 22:10 ` Dave Chinner
2021-06-17 8:26 ` [PATCH 7/8] xfs: attached iclog callbacks in xlog_cil_set_ctx_write_state() Dave Chinner
2021-06-17 20:55 ` Darrick J. Wong
2021-06-17 22:20 ` Dave Chinner
2021-06-17 8:26 ` [PATCH 8/8] xfs: order CIL checkpoint start records Dave Chinner
2021-06-17 21:31 ` Darrick J. Wong
2021-06-17 22:49 ` Dave Chinner
2021-06-17 18:32 ` [PATCH 0/8 V2] xfs: log fixes for for-next Brian Foster
2021-06-17 19:05 ` Darrick J. Wong
2021-06-17 20:06 ` Brian Foster
2021-06-17 20:26 ` Darrick J. Wong
2021-06-17 23:31 ` Brian Foster
2021-06-17 23:43 ` Dave Chinner
2021-06-18 13:08 ` Brian Foster
2021-06-18 13:55 ` Christoph Hellwig
2021-06-18 14:02 ` Christoph Hellwig
2021-06-18 22:28 ` Dave Chinner
2021-06-18 22:15 ` Dave Chinner
2021-06-18 22:48 ` Dave Chinner
2021-06-19 20:22 ` Darrick J. Wong
2021-06-20 22:18 ` Dave Chinner
-- strict thread matches above, loose matches on Subject: below --
2021-06-26 23:10 [PATCH 4/8] xfs: pass a CIL context to xlog_write() kernel test robot
2021-06-28 8:58 ` Dan Carpenter
2021-06-28 8:58 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210617175039.GU158209@locust \
--to=djwong@kernel.org \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.