From: Darrick J. Wong Date: Wed, 2 Oct 2024 01:20:19 +0000 (-0700) Subject: xfs: move xfs_rmap_update_defer_add to xfs_rmap_item.c X-Git-Tag: v6.11.0~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8a9e37d48d3b03c107127acc94e113c717e1dc1;p=thirdparty%2Fxfsprogs-dev.git xfs: move xfs_rmap_update_defer_add to xfs_rmap_item.c Source kernel commit: ea7b0820d960d5a3ee72bc67cbd8b5d47c67aa4c Move the code that adds the incore xfs_rmap_update_item deferred work data to a transaction to live with the RUI log item code. This means that the rmap code no longer has to know about the inner workings of the RUI log items. As a consequence, we can get rid of the _{get,put}_group helpers. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- diff --git a/libxfs/defer_item.c b/libxfs/defer_item.c index 7721267e..1c106b84 100644 --- a/libxfs/defer_item.c +++ b/libxfs/defer_item.c @@ -243,21 +243,18 @@ xfs_rmap_update_create_done( return NULL; } -/* Take an active ref to the AG containing the space we're rmapping. */ +/* Add this deferred RUI to the transaction. */ void -xfs_rmap_update_get_group( - struct xfs_mount *mp, +xfs_rmap_defer_add( + struct xfs_trans *tp, struct xfs_rmap_intent *ri) { - ri->ri_pag = xfs_perag_intent_get(mp, ri->ri_bmap.br_startblock); -} + struct xfs_mount *mp = tp->t_mountp; -/* Release an active AG ref after finishing rmapping work. */ -static inline void -xfs_rmap_update_put_group( - struct xfs_rmap_intent *ri) -{ - xfs_perag_intent_put(ri->ri_pag); + trace_xfs_rmap_defer(mp, ri); + + ri->ri_pag = xfs_perag_intent_get(mp, ri->ri_bmap.br_startblock); + xfs_defer_add(tp, &ri->ri_list, &xfs_rmap_update_defer_type); } /* Cancel a deferred rmap update. */ @@ -267,7 +264,7 @@ xfs_rmap_update_cancel_item( { struct xfs_rmap_intent *ri = ri_entry(item); - xfs_rmap_update_put_group(ri); + xfs_perag_intent_put(ri->ri_pag); kmem_cache_free(xfs_rmap_intent_cache, ri); } diff --git a/libxfs/defer_item.h b/libxfs/defer_item.h index 03f3f150..be354785 100644 --- a/libxfs/defer_item.h +++ b/libxfs/defer_item.h @@ -30,4 +30,8 @@ void xfs_extent_free_defer_add(struct xfs_trans *tp, struct xfs_extent_free_item *xefi, struct xfs_defer_pending **dfpp); +struct xfs_rmap_intent; + +void xfs_rmap_defer_add(struct xfs_trans *tp, struct xfs_rmap_intent *ri); + #endif /* __LIBXFS_DEFER_ITEM_H_ */ diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c index d60edaa2..22947e3c 100644 --- a/libxfs/xfs_rmap.c +++ b/libxfs/xfs_rmap.c @@ -23,6 +23,7 @@ #include "xfs_inode.h" #include "xfs_ag.h" #include "xfs_health.h" +#include "defer_item.h" struct kmem_cache *xfs_rmap_intent_cache; @@ -2655,10 +2656,7 @@ __xfs_rmap_add( ri->ri_whichfork = whichfork; ri->ri_bmap = *bmap; - trace_xfs_rmap_defer(tp->t_mountp, ri); - - xfs_rmap_update_get_group(tp->t_mountp, ri); - xfs_defer_add(tp, &ri->ri_list, &xfs_rmap_update_defer_type); + xfs_rmap_defer_add(tp, ri); } /* Map an extent into a file. */ diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h index 9d85dd2a..b783dd4d 100644 --- a/libxfs/xfs_rmap.h +++ b/libxfs/xfs_rmap.h @@ -176,9 +176,6 @@ struct xfs_rmap_intent { struct xfs_perag *ri_pag; }; -void xfs_rmap_update_get_group(struct xfs_mount *mp, - struct xfs_rmap_intent *ri); - /* functions for updating the rmapbt based on bmbt map/unmap operations */ void xfs_rmap_map_extent(struct xfs_trans *tp, struct xfs_inode *ip, int whichfork, struct xfs_bmbt_irec *imap);