Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: move xfs_bmap_defer_add to xfs_bmap_item.c

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

As a consequence, we can hide the _get_group helper.

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-02-22 12:44:21 -08:00
parent 5d3d0a6ad2
commit 8028411585
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@
#include "xfs_icache.h" #include "xfs_icache.h"
#include "xfs_iomap.h" #include "xfs_iomap.h"
#include "xfs_health.h" #include "xfs_health.h"
#include "xfs_bmap_item.h"
struct kmem_cache *xfs_bmap_intent_cache; struct kmem_cache *xfs_bmap_intent_cache;
@ -6198,10 +6199,7 @@ __xfs_bmap_add(
bi->bi_whichfork = whichfork; bi->bi_whichfork = whichfork;
bi->bi_bmap = *bmap; bi->bi_bmap = *bmap;
trace_xfs_bmap_defer(bi); xfs_bmap_defer_add(tp, bi);
xfs_bmap_update_get_group(tp->t_mountp, bi);
xfs_defer_add(tp, &bi->bi_list, &xfs_bmap_update_defer_type);
return 0; return 0;
} }

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

@ -245,9 +245,6 @@ struct xfs_bmap_intent {
struct xfs_bmbt_irec bi_bmap; struct xfs_bmbt_irec bi_bmap;
}; };
void xfs_bmap_update_get_group(struct xfs_mount *mp,
struct xfs_bmap_intent *bi);
int xfs_bmap_finish_one(struct xfs_trans *tp, struct xfs_bmap_intent *bi); int xfs_bmap_finish_one(struct xfs_trans *tp, struct xfs_bmap_intent *bi);
void xfs_bmap_map_extent(struct xfs_trans *tp, struct xfs_inode *ip, void xfs_bmap_map_extent(struct xfs_trans *tp, struct xfs_inode *ip,
struct xfs_bmbt_irec *imap); struct xfs_bmbt_irec *imap);

15
fs/xfs/xfs_bmap_item.c
View File

@ -25,6 +25,7 @@
#include "xfs_log_priv.h" #include "xfs_log_priv.h"
#include "xfs_log_recover.h" #include "xfs_log_recover.h"
#include "xfs_ag.h" #include "xfs_ag.h"
#include "xfs_trace.h"
struct kmem_cache *xfs_bui_cache; struct kmem_cache *xfs_bui_cache;
struct kmem_cache *xfs_bud_cache; struct kmem_cache *xfs_bud_cache;
@ -316,7 +317,7 @@ xfs_bmap_update_create_done(
} }
/* Take a passive ref to the AG containing the space we're mapping. */ /* Take a passive ref to the AG containing the space we're mapping. */
void static inline void
xfs_bmap_update_get_group( xfs_bmap_update_get_group(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_bmap_intent *bi) struct xfs_bmap_intent *bi)
@ -335,6 +336,18 @@ xfs_bmap_update_get_group(
bi->bi_pag = xfs_perag_intent_get(mp, agno); bi->bi_pag = xfs_perag_intent_get(mp, agno);
} }
/* Add this deferred BUI to the transaction. */
void
xfs_bmap_defer_add(
struct xfs_trans *tp,
struct xfs_bmap_intent *bi)
{
trace_xfs_bmap_defer(bi);
xfs_bmap_update_get_group(tp->t_mountp, bi);
xfs_defer_add(tp, &bi->bi_list, &xfs_bmap_update_defer_type);
}
/* Release a passive AG ref after finishing mapping work. */ /* Release a passive AG ref after finishing mapping work. */
static inline void static inline void
xfs_bmap_update_put_group( xfs_bmap_update_put_group(

4
fs/xfs/xfs_bmap_item.h
View File

@ -68,4 +68,8 @@ struct xfs_bud_log_item {
extern struct kmem_cache *xfs_bui_cache; extern struct kmem_cache *xfs_bui_cache;
extern struct kmem_cache *xfs_bud_cache; extern struct kmem_cache *xfs_bud_cache;
struct xfs_bmap_intent;
void xfs_bmap_defer_add(struct xfs_trans *tp, struct xfs_bmap_intent *bi);
#endif /* __XFS_BMAP_ITEM_H__ */ #endif /* __XFS_BMAP_ITEM_H__ */