MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-22 15:03:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfs: move xfs_refcount_update_defer_add to xfs_refcount_item.c

Browse Source 
Move the code that adds the incore xfs_refcount_update_item deferred
work data to a transaction live with the CUI log item code.  This means
that the refcount code no longer has to know about the inner workings of
the CUI log items.

As a consequence, we can get rid of the _{get,put}_group helpers.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2024-07-02 11:23:12 -07:00
parent e51987a12c
commit 783e8a7c9c
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/libxfs/xfs_refcount.c
View File

@ -24,6 +24,7 @@
#include "xfs_rmap.h" #include "xfs_rmap.h"
#include "xfs_ag.h" #include "xfs_ag.h"
#include "xfs_health.h" #include "xfs_health.h"
#include "xfs_refcount_item.h"
struct kmem_cache *xfs_refcount_intent_cache; struct kmem_cache *xfs_refcount_intent_cache;
@ -1435,10 +1436,7 @@ __xfs_refcount_add(
ri->ri_startblock = startblock; ri->ri_startblock = startblock;
ri->ri_blockcount = blockcount; ri->ri_blockcount = blockcount;
trace_xfs_refcount_defer(tp->t_mountp, ri); xfs_refcount_defer_add(tp, ri);
xfs_refcount_update_get_group(tp->t_mountp, ri);
xfs_defer_add(tp, &ri->ri_list, &xfs_refcount_update_defer_type);
} }
/* /*

3
fs/xfs/libxfs/xfs_refcount.h
View File

@ -74,9 +74,6 @@ xfs_refcount_check_domain(
return true; return true;
} }
void xfs_refcount_update_get_group(struct xfs_mount *mp,
struct xfs_refcount_intent *ri);
void xfs_refcount_increase_extent(struct xfs_trans *tp, void xfs_refcount_increase_extent(struct xfs_trans *tp,
struct xfs_bmbt_irec *irec); struct xfs_bmbt_irec *irec);
void xfs_refcount_decrease_extent(struct xfs_trans *tp, void xfs_refcount_decrease_extent(struct xfs_trans *tp,

24
fs/xfs/xfs_refcount_item.c
View File

@ -22,6 +22,7 @@
#include "xfs_log_recover.h" #include "xfs_log_recover.h"
#include "xfs_ag.h" #include "xfs_ag.h"
#include "xfs_btree.h" #include "xfs_btree.h"
#include "xfs_trace.h"
struct kmem_cache *xfs_cui_cache; struct kmem_cache *xfs_cui_cache;
struct kmem_cache *xfs_cud_cache; struct kmem_cache *xfs_cud_cache;
@ -319,21 +320,18 @@ xfs_refcount_update_create_done(
return &cudp->cud_item; return &cudp->cud_item;
} }
/* Take a passive ref to the AG containing the space we're refcounting. */ /* Add this deferred CUI to the transaction. */
void void
xfs_refcount_update_get_group( xfs_refcount_defer_add(
struct xfs_mount *mp, struct xfs_trans *tp,
struct xfs_refcount_intent *ri) struct xfs_refcount_intent *ri)
{ {
ri->ri_pag = xfs_perag_intent_get(mp, ri->ri_startblock); struct xfs_mount *mp = tp->t_mountp;
}
/* Release a passive AG ref after finishing refcounting work. */ trace_xfs_refcount_defer(mp, ri);
static inline void
xfs_refcount_update_put_group( ri->ri_pag = xfs_perag_intent_get(mp, ri->ri_startblock);
struct xfs_refcount_intent *ri) xfs_defer_add(tp, &ri->ri_list, &xfs_refcount_update_defer_type);
{
xfs_perag_intent_put(ri->ri_pag);
} }
/* Cancel a deferred refcount update. */ /* Cancel a deferred refcount update. */
@ -343,7 +341,7 @@ xfs_refcount_update_cancel_item(
{ {
struct xfs_refcount_intent *ri = ci_entry(item); struct xfs_refcount_intent *ri = ci_entry(item);
xfs_refcount_update_put_group(ri); xfs_perag_intent_put(ri->ri_pag);
kmem_cache_free(xfs_refcount_intent_cache, ri); kmem_cache_free(xfs_refcount_intent_cache, ri);
} }
@ -433,7 +431,7 @@ xfs_cui_recover_work(
ri->ri_type = pmap->pe_flags & XFS_REFCOUNT_EXTENT_TYPE_MASK; ri->ri_type = pmap->pe_flags & XFS_REFCOUNT_EXTENT_TYPE_MASK;
ri->ri_startblock = pmap->pe_startblock; ri->ri_startblock = pmap->pe_startblock;
ri->ri_blockcount = pmap->pe_len; ri->ri_blockcount = pmap->pe_len;
xfs_refcount_update_get_group(mp, ri); ri->ri_pag = xfs_perag_intent_get(mp, pmap->pe_startblock);
xfs_defer_add_item(dfp, &ri->ri_list); xfs_defer_add_item(dfp, &ri->ri_list);
} }

5
fs/xfs/xfs_refcount_item.h
View File

@ -71,4 +71,9 @@ struct xfs_cud_log_item {
extern struct kmem_cache *xfs_cui_cache; extern struct kmem_cache *xfs_cui_cache;
extern struct kmem_cache *xfs_cud_cache; extern struct kmem_cache *xfs_cud_cache;
struct xfs_refcount_intent;
void xfs_refcount_defer_add(struct xfs_trans *tp,
struct xfs_refcount_intent *ri);
#endif /* __XFS_REFCOUNT_ITEM_H__ */ #endif /* __XFS_REFCOUNT_ITEM_H__ */