From: Chandan Babu R <chandanrlinux@gmail.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 14/28] xfs: refactor recovered EFI log item playback
Date: Tue, 05 May 2020 14:33:13 +0530 [thread overview]
Message-ID: <1670737.fYoo42gQZr@garuda> (raw)
In-Reply-To: <158864112169.182683.14030031632354525711.stgit@magnolia>
On Tuesday 5 May 2020 6:42:01 AM IST Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Move the code that processes the log items created from the recovered
> log items into the per-item source code files and use dispatch functions
> to call them. No functional changes.
>
EFI log item playback is consistent with what was done before the patch is
applied.
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/xfs_extfree_item.c | 47 +++++++++++++++++++++++++++++++++++----------
> fs/xfs/xfs_extfree_item.h | 5 -----
> fs/xfs/xfs_log_recover.c | 46 ++++----------------------------------------
> fs/xfs/xfs_trans.h | 1 +
> 4 files changed, 42 insertions(+), 57 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
> index dca098660753..3fc8a9864217 100644
> --- a/fs/xfs/xfs_extfree_item.c
> +++ b/fs/xfs/xfs_extfree_item.c
> @@ -28,6 +28,8 @@
> kmem_zone_t *xfs_efi_zone;
> kmem_zone_t *xfs_efd_zone;
>
> +static const struct xfs_item_ops xfs_efi_item_ops;
> +
> static inline struct xfs_efi_log_item *EFI_ITEM(struct xfs_log_item *lip)
> {
> return container_of(lip, struct xfs_efi_log_item, efi_item);
> @@ -51,7 +53,7 @@ xfs_efi_item_free(
> * committed vs unpin operations in bulk insert operations. Hence the reference
> * count to ensure only the last caller frees the EFI.
> */
> -void
> +STATIC void
> xfs_efi_release(
> struct xfs_efi_log_item *efip)
> {
> @@ -141,14 +143,6 @@ xfs_efi_item_release(
> xfs_efi_release(EFI_ITEM(lip));
> }
>
> -static const struct xfs_item_ops xfs_efi_item_ops = {
> - .iop_size = xfs_efi_item_size,
> - .iop_format = xfs_efi_item_format,
> - .iop_unpin = xfs_efi_item_unpin,
> - .iop_release = xfs_efi_item_release,
> -};
> -
> -
> /*
> * Allocate and initialize an efi item with the given number of extents.
> */
> @@ -586,7 +580,7 @@ const struct xfs_defer_op_type xfs_agfl_free_defer_type = {
> * Process an extent free intent item that was recovered from
> * the log. We need to free the extents that it describes.
> */
> -int
> +STATIC int
> xfs_efi_recover(
> struct xfs_mount *mp,
> struct xfs_efi_log_item *efip)
> @@ -647,6 +641,39 @@ xfs_efi_recover(
> return error;
> }
>
> +/* Recover the EFI if necessary. */
> +STATIC int
> +xfs_efi_item_recover(
> + struct xfs_log_item *lip,
> + struct xfs_trans *tp)
> +{
> + struct xfs_ail *ailp = lip->li_ailp;
> + struct xfs_efi_log_item *efip;
> + int error;
> +
> + /*
> + * Skip EFIs that we've already processed.
> + */
> + efip = container_of(lip, struct xfs_efi_log_item, efi_item);
> + if (test_bit(XFS_EFI_RECOVERED, &efip->efi_flags))
> + return 0;
> +
> + spin_unlock(&ailp->ail_lock);
> + error = xfs_efi_recover(tp->t_mountp, efip);
> + spin_lock(&ailp->ail_lock);
> +
> + return error;
> +}
> +
> +static const struct xfs_item_ops xfs_efi_item_ops = {
> + .iop_size = xfs_efi_item_size,
> + .iop_format = xfs_efi_item_format,
> + .iop_unpin = xfs_efi_item_unpin,
> + .iop_release = xfs_efi_item_release,
> + .iop_recover = xfs_efi_item_recover,
> +};
> +
> +
> /*
> * This routine is called to create an in-core extent free intent
> * item from the efi format structure which was logged on disk.
> diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h
> index 876e3d237f48..4b2c2c5c5985 100644
> --- a/fs/xfs/xfs_extfree_item.h
> +++ b/fs/xfs/xfs_extfree_item.h
> @@ -78,9 +78,4 @@ struct xfs_efd_log_item {
> extern struct kmem_zone *xfs_efi_zone;
> extern struct kmem_zone *xfs_efd_zone;
>
> -void xfs_efi_release(struct xfs_efi_log_item *);
> -
> -int xfs_efi_recover(struct xfs_mount *mp,
> - struct xfs_efi_log_item *efip);
> -
> #endif /* __XFS_EXTFREE_ITEM_H__ */
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 929e2caeeb42..f12e14719202 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -2553,46 +2553,6 @@ xlog_recover_process_data(
> return 0;
> }
>
> -/* Recover the EFI if necessary. */
> -STATIC int
> -xlog_recover_process_efi(
> - struct xfs_mount *mp,
> - struct xfs_ail *ailp,
> - struct xfs_log_item *lip)
> -{
> - struct xfs_efi_log_item *efip;
> - int error;
> -
> - /*
> - * Skip EFIs that we've already processed.
> - */
> - efip = container_of(lip, struct xfs_efi_log_item, efi_item);
> - if (test_bit(XFS_EFI_RECOVERED, &efip->efi_flags))
> - return 0;
> -
> - spin_unlock(&ailp->ail_lock);
> - error = xfs_efi_recover(mp, efip);
> - spin_lock(&ailp->ail_lock);
> -
> - return error;
> -}
> -
> -/* Release the EFI since we're cancelling everything. */
> -STATIC void
> -xlog_recover_cancel_efi(
> - struct xfs_mount *mp,
> - struct xfs_ail *ailp,
> - struct xfs_log_item *lip)
> -{
> - struct xfs_efi_log_item *efip;
> -
> - efip = container_of(lip, struct xfs_efi_log_item, efi_item);
> -
> - spin_unlock(&ailp->ail_lock);
> - xfs_efi_release(efip);
> - spin_lock(&ailp->ail_lock);
> -}
> -
> /* Recover the RUI if necessary. */
> STATIC int
> xlog_recover_process_rui(
> @@ -2837,7 +2797,7 @@ xlog_recover_process_intents(
> */
> switch (lip->li_type) {
> case XFS_LI_EFI:
> - error = xlog_recover_process_efi(log->l_mp, ailp, lip);
> + error = lip->li_ops->iop_recover(lip, parent_tp);
> break;
> case XFS_LI_RUI:
> error = xlog_recover_process_rui(log->l_mp, ailp, lip);
> @@ -2893,7 +2853,9 @@ xlog_recover_cancel_intents(
>
> switch (lip->li_type) {
> case XFS_LI_EFI:
> - xlog_recover_cancel_efi(log->l_mp, ailp, lip);
> + spin_unlock(&ailp->ail_lock);
> + lip->li_ops->iop_release(lip);
> + spin_lock(&ailp->ail_lock);
> break;
> case XFS_LI_RUI:
> xlog_recover_cancel_rui(log->l_mp, ailp, lip);
> diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
> index 752c7fef9de7..3f6a79108991 100644
> --- a/fs/xfs/xfs_trans.h
> +++ b/fs/xfs/xfs_trans.h
> @@ -77,6 +77,7 @@ struct xfs_item_ops {
> void (*iop_release)(struct xfs_log_item *);
> xfs_lsn_t (*iop_committed)(struct xfs_log_item *, xfs_lsn_t);
> void (*iop_error)(struct xfs_log_item *, xfs_buf_t *);
> + int (*iop_recover)(struct xfs_log_item *lip, struct xfs_trans *tp);
> };
>
> /*
>
>
--
chandan
next prev parent reply other threads:[~2020-05-05 9:03 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 1:10 [PATCH v3 00/28] xfs: refactor log recovery Darrick J. Wong
2020-05-05 1:10 ` [PATCH 01/28] xfs: convert xfs_log_recover_item_t to struct xfs_log_recover_item Darrick J. Wong
2020-05-05 3:33 ` Chandan Babu R
2020-05-06 14:59 ` Christoph Hellwig
2020-05-05 1:10 ` [PATCH 02/28] xfs: refactor log recovery item sorting into a generic dispatch structure Darrick J. Wong
2020-05-05 4:11 ` Chandan Babu R
2020-05-06 15:03 ` Christoph Hellwig
2020-05-06 18:36 ` Darrick J. Wong
2020-05-05 1:10 ` [PATCH 03/28] xfs: refactor log recovery item dispatch for pass2 readhead functions Darrick J. Wong
2020-05-05 4:32 ` Chandan Babu R
2020-05-06 15:04 ` Christoph Hellwig
2020-05-05 1:10 ` [PATCH 04/28] xfs: refactor log recovery item dispatch for pass1 commit functions Darrick J. Wong
2020-05-05 4:40 ` Chandan Babu R
2020-05-06 15:07 ` Christoph Hellwig
2020-05-05 1:11 ` [PATCH 05/28] xfs: refactor log recovery buffer item dispatch for pass2 " Darrick J. Wong
2020-05-05 5:03 ` Chandan Babu R
2020-05-06 15:09 ` Christoph Hellwig
2020-05-05 1:11 ` [PATCH 06/28] xfs: refactor log recovery inode " Darrick J. Wong
2020-05-05 5:09 ` Chandan Babu R
2020-05-06 15:10 ` Christoph Hellwig
2020-05-05 1:11 ` [PATCH 07/28] xfs: refactor log recovery dquot " Darrick J. Wong
2020-05-05 5:13 ` Chandan Babu R
2020-05-06 15:11 ` Christoph Hellwig
2020-05-05 1:11 ` [PATCH 08/28] xfs: refactor log recovery icreate " Darrick J. Wong
2020-05-05 6:10 ` Chandan Babu R
2020-05-06 15:11 ` Christoph Hellwig
2020-05-05 1:11 ` [PATCH 09/28] xfs: refactor log recovery EFI " Darrick J. Wong
2020-05-05 6:46 ` Chandan Babu R
2020-05-06 15:12 ` Christoph Hellwig
2020-05-05 1:11 ` [PATCH 10/28] xfs: refactor log recovery RUI " Darrick J. Wong
2020-05-05 7:02 ` Chandan Babu R
2020-05-06 15:12 ` Christoph Hellwig
2020-05-06 15:13 ` Christoph Hellwig
2020-05-05 1:11 ` [PATCH 11/28] xfs: refactor log recovery CUI " Darrick J. Wong
2020-05-05 7:06 ` Chandan Babu R
2020-05-06 15:13 ` Christoph Hellwig
2020-05-05 1:11 ` [PATCH 12/28] xfs: refactor log recovery BUI " Darrick J. Wong
2020-05-05 7:14 ` Chandan Babu R
2020-05-06 15:14 ` Christoph Hellwig
2020-05-05 1:11 ` [PATCH 13/28] xfs: remove log recovery quotaoff " Darrick J. Wong
2020-05-05 7:32 ` Chandan Babu R
2020-05-06 15:16 ` Christoph Hellwig
2020-05-06 16:48 ` Darrick J. Wong
2020-05-05 1:12 ` [PATCH 14/28] xfs: refactor recovered EFI log item playback Darrick J. Wong
2020-05-05 9:03 ` Chandan Babu R [this message]
2020-05-06 15:18 ` Christoph Hellwig
2020-05-06 18:59 ` Darrick J. Wong
2020-05-05 1:12 ` [PATCH 15/28] xfs: refactor recovered RUI " Darrick J. Wong
2020-05-05 9:10 ` Chandan Babu R
2020-05-06 15:18 ` Christoph Hellwig
2020-05-06 15:19 ` Christoph Hellwig
2020-05-05 1:12 ` [PATCH 16/28] xfs: refactor recovered CUI " Darrick J. Wong
2020-05-05 9:29 ` Chandan Babu R
2020-05-05 9:29 ` Chandan Babu R
2020-05-06 15:19 ` Christoph Hellwig
2020-05-05 1:12 ` [PATCH 17/28] xfs: refactor recovered BUI " Darrick J. Wong
2020-05-05 9:49 ` Chandan Babu R
2020-05-06 15:21 ` Christoph Hellwig
2020-05-05 1:12 ` [PATCH 18/28] xfs: refactor unlinked inode recovery Darrick J. Wong
2020-05-05 13:05 ` Chandan Babu R
2020-05-06 15:26 ` Christoph Hellwig
2020-05-06 16:51 ` Darrick J. Wong
2020-05-05 1:12 ` [PATCH 19/28] xfs: refactor xlog_recover_process_unlinked Darrick J. Wong
2020-05-05 13:19 ` Chandan Babu R
2020-05-05 13:30 ` Chandan Babu R
2020-05-06 19:11 ` Darrick J. Wong
2020-05-06 15:27 ` Christoph Hellwig
2020-05-05 1:12 ` [PATCH 20/28] xfs: report iunlink recovery failure upwards Darrick J. Wong
2020-05-05 13:43 ` Chandan Babu R
2020-05-06 15:27 ` Christoph Hellwig
2020-05-05 1:12 ` [PATCH 21/28] xfs: refactor releasing finished intents during log recovery Darrick J. Wong
2020-05-06 4:06 ` Chandan Babu R
2020-05-06 15:29 ` Christoph Hellwig
2020-05-05 1:12 ` [PATCH 22/28] xfs: refactor adding recovered intent items to the log Darrick J. Wong
2020-05-06 15:31 ` Christoph Hellwig
2020-05-06 19:28 ` Darrick J. Wong
2020-05-05 1:12 ` [PATCH 23/28] xfs: refactor intent item RECOVERED flag into the log item Darrick J. Wong
2020-05-06 4:45 ` Chandan Babu R
2020-05-06 15:32 ` Christoph Hellwig
2020-05-05 1:13 ` [PATCH 24/28] xfs: refactor intent item iop_recover calls Darrick J. Wong
2020-05-06 5:14 ` Chandan Babu R
2020-05-06 15:34 ` Christoph Hellwig
2020-05-05 1:13 ` [PATCH 25/28] xfs: hoist setting of XFS_LI_RECOVERED to caller Darrick J. Wong
2020-05-06 5:34 ` Chandan Babu R
2020-05-06 15:35 ` Christoph Hellwig
2020-05-05 1:13 ` [PATCH 26/28] xfs: move log recovery buffer cancellation code to xfs_buf_item_recover.c Darrick J. Wong
2020-05-06 6:42 ` Chandan Babu R
2020-05-06 15:35 ` Christoph Hellwig
2020-05-05 1:13 ` [PATCH 27/28] xfs: remove unnecessary includes from xfs_log_recover.c Darrick J. Wong
2020-05-06 7:21 ` Chandan Babu R
2020-05-05 1:13 ` [PATCH 28/28] xfs: use parallel processing to clear unlinked metadata Darrick J. Wong
2020-05-06 7:57 ` Chandan Babu R
2020-05-06 15:36 ` Christoph Hellwig
2020-05-06 16:54 ` Darrick J. Wong
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=1670737.fYoo42gQZr@garuda \
--to=chandanrlinux@gmail.com \
--cc=darrick.wong@oracle.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox