From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Chandan Babu R <chandan.babu@oracle.com>,
"open list:XFS FILESYSTEM" <linux-xfs@vger.kernel.org>
Subject: Re: [PATCH 4/5] xfs: pass the defer ops instead of type to xfs_defer_start_recovery
Date: Wed, 13 Dec 2023 10:15:32 -0800 [thread overview]
Message-ID: <20231213181532.GG361584@frogsfrogsfrogs> (raw)
In-Reply-To: <20231213090633.231707-5-hch@lst.de>
On Wed, Dec 13, 2023 at 10:06:32AM +0100, Christoph Hellwig wrote:
> xfs_defer_start_recovery is only called from xlog_recover_intent_item,
> and the callers of that all have the actual xfs_defer_ops_type operation
> vector at hand. Pass that directly instead of looking it up from the
> defer_op_types table.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/xfs/libxfs/xfs_defer.c | 6 +++---
> fs/xfs/libxfs/xfs_defer.h | 2 +-
> fs/xfs/libxfs/xfs_log_recover.h | 3 ++-
> fs/xfs/xfs_attr_item.c | 2 +-
> fs/xfs/xfs_bmap_item.c | 2 +-
> fs/xfs/xfs_extfree_item.c | 2 +-
> fs/xfs/xfs_log_recover.c | 4 ++--
> fs/xfs/xfs_refcount_item.c | 2 +-
> fs/xfs/xfs_rmap_item.c | 2 +-
> 9 files changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
> index e70881ae5cc597..6a6444ffe5544b 100644
> --- a/fs/xfs/libxfs/xfs_defer.c
> +++ b/fs/xfs/libxfs/xfs_defer.c
> @@ -894,14 +894,14 @@ xfs_defer_add_barrier(
> void
> xfs_defer_start_recovery(
> struct xfs_log_item *lip,
> - enum xfs_defer_ops_type dfp_type,
> - struct list_head *r_dfops)
> + struct list_head *r_dfops,
> + const struct xfs_defer_op_type *ops)
Nit: tab before the parameter name ^
With that fixed,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> {
> struct xfs_defer_pending *dfp;
>
> dfp = kmem_cache_zalloc(xfs_defer_pending_cache,
> GFP_NOFS | __GFP_NOFAIL);
> - dfp->dfp_ops = defer_op_types[dfp_type];
> + dfp->dfp_ops = ops;
> dfp->dfp_intent = lip;
> INIT_LIST_HEAD(&dfp->dfp_work);
> list_add_tail(&dfp->dfp_list, r_dfops);
> diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h
> index 957a06278e880d..60de91b6639225 100644
> --- a/fs/xfs/libxfs/xfs_defer.h
> +++ b/fs/xfs/libxfs/xfs_defer.h
> @@ -147,7 +147,7 @@ void xfs_defer_ops_capture_abort(struct xfs_mount *mp,
> void xfs_defer_resources_rele(struct xfs_defer_resources *dres);
>
> void xfs_defer_start_recovery(struct xfs_log_item *lip,
> - enum xfs_defer_ops_type dfp_type, struct list_head *r_dfops);
> + struct list_head *r_dfops, const struct xfs_defer_op_type *ops);
> void xfs_defer_cancel_recovery(struct xfs_mount *mp,
> struct xfs_defer_pending *dfp);
> int xfs_defer_finish_recovery(struct xfs_mount *mp,
> diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
> index c8e5d912895bcd..9fe7a9564bca96 100644
> --- a/fs/xfs/libxfs/xfs_log_recover.h
> +++ b/fs/xfs/libxfs/xfs_log_recover.h
> @@ -11,6 +11,7 @@
> * define how recovery should work for that type of log item.
> */
> struct xlog_recover_item;
> +struct xfs_defer_op_type;
>
> /* Sorting hat for log items as they're read in. */
> enum xlog_recover_reorder {
> @@ -156,7 +157,7 @@ xlog_recover_resv(const struct xfs_trans_res *r)
> struct xfs_defer_pending;
>
> void xlog_recover_intent_item(struct xlog *log, struct xfs_log_item *lip,
> - xfs_lsn_t lsn, unsigned int dfp_type);
> + xfs_lsn_t lsn, const struct xfs_defer_op_type *ops);
> int xlog_recover_finish_intent(struct xfs_trans *tp,
> struct xfs_defer_pending *dfp);
>
> diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
> index beae2de824507b..9e02111bd89010 100644
> --- a/fs/xfs/xfs_attr_item.c
> +++ b/fs/xfs/xfs_attr_item.c
> @@ -759,7 +759,7 @@ xlog_recover_attri_commit_pass2(
> memcpy(&attrip->attri_format, attri_formatp, len);
>
> xlog_recover_intent_item(log, &attrip->attri_item, lsn,
> - XFS_DEFER_OPS_TYPE_ATTR);
> + &xfs_attr_defer_type);
> xfs_attri_log_nameval_put(nv);
> return 0;
> }
> diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
> index f43abf0b648641..52fb8a148b7dcb 100644
> --- a/fs/xfs/xfs_bmap_item.c
> +++ b/fs/xfs/xfs_bmap_item.c
> @@ -650,7 +650,7 @@ xlog_recover_bui_commit_pass2(
> atomic_set(&buip->bui_next_extent, bui_formatp->bui_nextents);
>
> xlog_recover_intent_item(log, &buip->bui_item, lsn,
> - XFS_DEFER_OPS_TYPE_BMAP);
> + &xfs_bmap_update_defer_type);
> return 0;
> }
>
> diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
> index e67907a379c8e8..1d1185fca6a58e 100644
> --- a/fs/xfs/xfs_extfree_item.c
> +++ b/fs/xfs/xfs_extfree_item.c
> @@ -747,7 +747,7 @@ xlog_recover_efi_commit_pass2(
> atomic_set(&efip->efi_next_extent, efi_formatp->efi_nextents);
>
> xlog_recover_intent_item(log, &efip->efi_item, lsn,
> - XFS_DEFER_OPS_TYPE_FREE);
> + &xfs_extent_free_defer_type);
> return 0;
> }
>
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index c18692af2c651c..1251c81e55f982 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -1942,11 +1942,11 @@ xlog_recover_intent_item(
> struct xlog *log,
> struct xfs_log_item *lip,
> xfs_lsn_t lsn,
> - unsigned int dfp_type)
> + const struct xfs_defer_op_type *ops)
> {
> ASSERT(xlog_item_is_intent(lip));
>
> - xfs_defer_start_recovery(lip, dfp_type, &log->r_dfops);
> + xfs_defer_start_recovery(lip, &log->r_dfops, ops);
>
> /*
> * Insert the intent into the AIL directly and drop one reference so
> diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
> index b08839550f34a3..20ad8086da60be 100644
> --- a/fs/xfs/xfs_refcount_item.c
> +++ b/fs/xfs/xfs_refcount_item.c
> @@ -605,7 +605,7 @@ xlog_recover_cui_commit_pass2(
> atomic_set(&cuip->cui_next_extent, cui_formatp->cui_nextents);
>
> xlog_recover_intent_item(log, &cuip->cui_item, lsn,
> - XFS_DEFER_OPS_TYPE_REFCOUNT);
> + &xfs_refcount_update_defer_type);
> return 0;
> }
>
> diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
> index 65b432eb5d025d..79ad0087aecaf5 100644
> --- a/fs/xfs/xfs_rmap_item.c
> +++ b/fs/xfs/xfs_rmap_item.c
> @@ -658,7 +658,7 @@ xlog_recover_rui_commit_pass2(
> atomic_set(&ruip->rui_next_extent, rui_formatp->rui_nextents);
>
> xlog_recover_intent_item(log, &ruip->rui_item, lsn,
> - XFS_DEFER_OPS_TYPE_RMAP);
> + &xfs_rmap_update_defer_type);
> return 0;
> }
>
> --
> 2.39.2
>
>
next prev parent reply other threads:[~2023-12-13 18:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-13 9:06 pass ops directly to the xfs_defer helpers Christoph Hellwig
2023-12-13 9:06 ` [PATCH 1/5] xfs: consolidate the xfs_attr_defer_* helpers Christoph Hellwig
2023-12-13 18:10 ` Darrick J. Wong
2023-12-13 9:06 ` [PATCH 2/5] xfs: move xfs_attr_defer_type up in xfs_attr_item.c Christoph Hellwig
2023-12-13 18:10 ` Darrick J. Wong
2023-12-13 9:06 ` [PATCH 3/5] xfs: store an ops pointer in struct xfs_defer_pending Christoph Hellwig
2023-12-13 18:14 ` Darrick J. Wong
2023-12-13 9:06 ` [PATCH 4/5] xfs: pass the defer ops instead of type to xfs_defer_start_recovery Christoph Hellwig
2023-12-13 18:15 ` Darrick J. Wong [this message]
2023-12-14 5:16 ` [PATCH 4/5 v1.1] " Christoph Hellwig
2023-12-14 17:20 ` Darrick J. Wong
2023-12-13 9:06 ` [PATCH 5/5] xfs: pass the defer ops directly to xfs_defer_add Christoph Hellwig
2023-12-13 18:16 ` 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=20231213181532.GG361584@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=chandan.babu@oracle.com \
--cc=hch@lst.de \
--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.