On Tuesday 5 May 2020 6:42:07 AM IST Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> 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.
>
RUI log item playback is consistent with what was done before the patch is
applied.
Reviewed-by: Chandan Babu R <chandanrlinux@xxxxxxxxx>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> fs/xfs/xfs_log_recover.c | 48 ++--------------------------------------------
> fs/xfs/xfs_rmap_item.c | 44 ++++++++++++++++++++++++++++++++++--------
> fs/xfs/xfs_rmap_item.h | 3 ---
> 3 files changed, 37 insertions(+), 58 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index f12e14719202..da66484acaa7 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 RUI if necessary. */
> -STATIC int
> -xlog_recover_process_rui(
> - struct xfs_mount *mp,
> - struct xfs_ail *ailp,
> - struct xfs_log_item *lip)
> -{
> - struct xfs_rui_log_item *ruip;
> - int error;
> -
> - /*
> - * Skip RUIs that we've already processed.
> - */
> - ruip = container_of(lip, struct xfs_rui_log_item, rui_item);
> - if (test_bit(XFS_RUI_RECOVERED, &ruip->rui_flags))
> - return 0;
> -
> - spin_unlock(&ailp->ail_lock);
> - error = xfs_rui_recover(mp, ruip);
> - spin_lock(&ailp->ail_lock);
> -
> - return error;
> -}
> -
> -/* Release the RUI since we're cancelling everything. */
> -STATIC void
> -xlog_recover_cancel_rui(
> - struct xfs_mount *mp,
> - struct xfs_ail *ailp,
> - struct xfs_log_item *lip)
> -{
> - struct xfs_rui_log_item *ruip;
> -
> - ruip = container_of(lip, struct xfs_rui_log_item, rui_item);
> -
> - spin_unlock(&ailp->ail_lock);
> - xfs_rui_release(ruip);
> - spin_lock(&ailp->ail_lock);
> -}
> -
> /* Recover the CUI if necessary. */
> STATIC int
> xlog_recover_process_cui(
> @@ -2797,10 +2757,8 @@ xlog_recover_process_intents(
> */
> switch (lip->li_type) {
> case XFS_LI_EFI:
> - error = lip->li_ops->iop_recover(lip, parent_tp);
> - break;
> case XFS_LI_RUI:
> - error = xlog_recover_process_rui(log->l_mp, ailp, lip);
> + error = lip->li_ops->iop_recover(lip, parent_tp);
> break;
> case XFS_LI_CUI:
> error = xlog_recover_process_cui(parent_tp, ailp, lip);
> @@ -2853,13 +2811,11 @@ xlog_recover_cancel_intents(
>
> switch (lip->li_type) {
> case XFS_LI_EFI:
> + case XFS_LI_RUI:
> 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);
> - break;
> case XFS_LI_CUI:
> xlog_recover_cancel_cui(log->l_mp, ailp, lip);
> break;
> diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
> index c87f4e429c12..e763dd8ed0a6 100644
> --- a/fs/xfs/xfs_rmap_item.c
> +++ b/fs/xfs/xfs_rmap_item.c
> @@ -24,6 +24,8 @@
> kmem_zone_t *xfs_rui_zone;
> kmem_zone_t *xfs_rud_zone;
>
> +static const struct xfs_item_ops xfs_rui_item_ops;
> +
> static inline struct xfs_rui_log_item *RUI_ITEM(struct xfs_log_item *lip)
> {
> return container_of(lip, struct xfs_rui_log_item, rui_item);
> @@ -46,7 +48,7 @@ xfs_rui_item_free(
> * committed vs unpin operations in bulk insert operations. Hence the reference
> * count to ensure only the last caller frees the RUI.
> */
> -void
> +STATIC void
> xfs_rui_release(
> struct xfs_rui_log_item *ruip)
> {
> @@ -124,13 +126,6 @@ xfs_rui_item_release(
> xfs_rui_release(RUI_ITEM(lip));
> }
>
> -static const struct xfs_item_ops xfs_rui_item_ops = {
> - .iop_size = xfs_rui_item_size,
> - .iop_format = xfs_rui_item_format,
> - .iop_unpin = xfs_rui_item_unpin,
> - .iop_release = xfs_rui_item_release,
> -};
> -
> /*
> * Allocate and initialize an rui item with the given number of extents.
> */
> @@ -468,7 +463,7 @@ const struct xfs_defer_op_type xfs_rmap_update_defer_type = {
> * Process an rmap update intent item that was recovered from the log.
> * We need to update the rmapbt.
> */
> -int
> +STATIC int
> xfs_rui_recover(
> struct xfs_mount *mp,
> struct xfs_rui_log_item *ruip)
> @@ -588,6 +583,37 @@ xfs_rui_recover(
> return error;
> }
>
> +/* Recover the RUI if necessary. */
> +STATIC int
> +xfs_rui_item_recover(
> + struct xfs_log_item *lip,
> + struct xfs_trans *tp)
> +{
> + struct xfs_ail *ailp = lip->li_ailp;
> + struct xfs_rui_log_item *ruip = RUI_ITEM(lip);
> + int error;
> +
> + /*
> + * Skip RUIs that we've already processed.
> + */
> + if (test_bit(XFS_RUI_RECOVERED, &ruip->rui_flags))
> + return 0;
> +
> + spin_unlock(&ailp->ail_lock);
> + error = xfs_rui_recover(tp->t_mountp, ruip);
> + spin_lock(&ailp->ail_lock);
> +
> + return error;
> +}
> +
> +static const struct xfs_item_ops xfs_rui_item_ops = {
> + .iop_size = xfs_rui_item_size,
> + .iop_format = xfs_rui_item_format,
> + .iop_unpin = xfs_rui_item_unpin,
> + .iop_release = xfs_rui_item_release,
> + .iop_recover = xfs_rui_item_recover,
> +};
> +
> /*
> * This routine is called to create an in-core extent rmap update
> * item from the rui format structure which was logged on disk.
> diff --git a/fs/xfs/xfs_rmap_item.h b/fs/xfs/xfs_rmap_item.h
> index 89bd192779f8..48a77a6f5c94 100644
> --- a/fs/xfs/xfs_rmap_item.h
> +++ b/fs/xfs/xfs_rmap_item.h
> @@ -77,7 +77,4 @@ struct xfs_rud_log_item {
> extern struct kmem_zone *xfs_rui_zone;
> extern struct kmem_zone *xfs_rud_zone;
>
> -void xfs_rui_release(struct xfs_rui_log_item *);
> -int xfs_rui_recover(struct xfs_mount *mp, struct xfs_rui_log_item *ruip);
> -
> #endif /* __XFS_RMAP_ITEM_H__ */
>
>
--
chandan
