system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-17 00:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: initialize btree blocks using btree_ops structure

Browse source 
Notice now that the btree ops structure encodes btree geometry flags and
the magic number through the buffer ops.  Refactor the btree block
initialization functions to use the btree ops so that we no longer have
to open code all that.

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:35:16 -08:00
parent d8d6df4253
commit c87e3bf780
8 changed files with 69 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
fs/xfs/libxfs/xfs_ag.c
View file

@ -492,7 +492,7 @@ xfs_btroot_init(
struct xfs_buf *bp, struct xfs_buf *bp,
struct aghdr_init_data *id) struct aghdr_init_data *id)
{ {
xfs_btree_init_block(mp, bp, id->type, 0, 0, id->agno); xfs_btree_init_block(mp, bp, id->bc_ops, 0, 0, id->agno);
} }
/* Finish initializing a free space btree. */ /* Finish initializing a free space btree. */
@ -550,7 +550,7 @@ xfs_freesp_init_recs(
} }
/* /*
* Alloc btree root block init functions * bnobt/cntbt btree root block init functions
*/ */
static void static void
xfs_bnoroot_init( xfs_bnoroot_init(
@ -558,17 +558,7 @@ xfs_bnoroot_init(
struct xfs_buf *bp, struct xfs_buf *bp,
struct aghdr_init_data *id) struct aghdr_init_data *id)
{ {
xfs_btree_init_block(mp, bp, XFS_BTNUM_BNO, 0, 0, id->agno); xfs_btree_init_block(mp, bp, id->bc_ops, 0, 0, id->agno);
xfs_freesp_init_recs(mp, bp, id);
}
static void
xfs_cntroot_init(
struct xfs_mount *mp,
struct xfs_buf *bp,
struct aghdr_init_data *id)
{
xfs_btree_init_block(mp, bp, XFS_BTNUM_CNT, 0, 0, id->agno);
xfs_freesp_init_recs(mp, bp, id); xfs_freesp_init_recs(mp, bp, id);
} }
@ -584,7 +574,7 @@ xfs_rmaproot_init(
struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp);
struct xfs_rmap_rec *rrec; struct xfs_rmap_rec *rrec;
xfs_btree_init_block(mp, bp, XFS_BTNUM_RMAP, 0, 4, id->agno); xfs_btree_init_block(mp, bp, id->bc_ops, 0, 4, id->agno);
/* /*
* mark the AG header regions as static metadata The BNO * mark the AG header regions as static metadata The BNO
@ -797,7 +787,7 @@ struct xfs_aghdr_grow_data {
size_t numblks; size_t numblks;
const struct xfs_buf_ops *ops; const struct xfs_buf_ops *ops;
aghdr_init_work_f work; aghdr_init_work_f work;
xfs_btnum_t type; const struct xfs_btree_ops *bc_ops;
bool need_init; bool need_init;
}; };
@ -851,13 +841,15 @@ xfs_ag_init_headers(
.numblks = BTOBB(mp->m_sb.sb_blocksize), .numblks = BTOBB(mp->m_sb.sb_blocksize),
.ops = &xfs_bnobt_buf_ops, .ops = &xfs_bnobt_buf_ops,
.work = &xfs_bnoroot_init, .work = &xfs_bnoroot_init,
.bc_ops = &xfs_bnobt_ops,
.need_init = true .need_init = true
}, },
{ /* CNT root block */ { /* CNT root block */
.daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_CNT_BLOCK(mp)), .daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_CNT_BLOCK(mp)),
.numblks = BTOBB(mp->m_sb.sb_blocksize), .numblks = BTOBB(mp->m_sb.sb_blocksize),
.ops = &xfs_cntbt_buf_ops, .ops = &xfs_cntbt_buf_ops,
.work = &xfs_cntroot_init, .work = &xfs_bnoroot_init,
.bc_ops = &xfs_cntbt_ops,
.need_init = true .need_init = true
}, },
{ /* INO root block */ { /* INO root block */
@ -865,7 +857,7 @@ xfs_ag_init_headers(
.numblks = BTOBB(mp->m_sb.sb_blocksize), .numblks = BTOBB(mp->m_sb.sb_blocksize),
.ops = &xfs_inobt_buf_ops, .ops = &xfs_inobt_buf_ops,
.work = &xfs_btroot_init, .work = &xfs_btroot_init,
.type = XFS_BTNUM_INO, .bc_ops = &xfs_inobt_ops,
.need_init = true .need_init = true
}, },
{ /* FINO root block */ { /* FINO root block */
@ -873,7 +865,7 @@ xfs_ag_init_headers(
.numblks = BTOBB(mp->m_sb.sb_blocksize), .numblks = BTOBB(mp->m_sb.sb_blocksize),
.ops = &xfs_finobt_buf_ops, .ops = &xfs_finobt_buf_ops,
.work = &xfs_btroot_init, .work = &xfs_btroot_init,
.type = XFS_BTNUM_FINO, .bc_ops = &xfs_finobt_ops,
.need_init = xfs_has_finobt(mp) .need_init = xfs_has_finobt(mp)
}, },
{ /* RMAP root block */ { /* RMAP root block */
@ -881,6 +873,7 @@ xfs_ag_init_headers(
.numblks = BTOBB(mp->m_sb.sb_blocksize), .numblks = BTOBB(mp->m_sb.sb_blocksize),
.ops = &xfs_rmapbt_buf_ops, .ops = &xfs_rmapbt_buf_ops,
.work = &xfs_rmaproot_init, .work = &xfs_rmaproot_init,
.bc_ops = &xfs_rmapbt_ops,
.need_init = xfs_has_rmapbt(mp) .need_init = xfs_has_rmapbt(mp)
}, },
{ /* REFC root block */ { /* REFC root block */
@ -888,7 +881,7 @@ xfs_ag_init_headers(
.numblks = BTOBB(mp->m_sb.sb_blocksize), .numblks = BTOBB(mp->m_sb.sb_blocksize),
.ops = &xfs_refcountbt_buf_ops, .ops = &xfs_refcountbt_buf_ops,
.work = &xfs_btroot_init, .work = &xfs_btroot_init,
.type = XFS_BTNUM_REFC, .bc_ops = &xfs_refcountbt_ops,
.need_init = xfs_has_reflink(mp) .need_init = xfs_has_reflink(mp)
}, },
{ /* NULL terminating block */ { /* NULL terminating block */
@ -906,7 +899,7 @@ xfs_ag_init_headers(
id->daddr = dp->daddr; id->daddr = dp->daddr;
id->numblks = dp->numblks; id->numblks = dp->numblks;
id->type = dp->type; id->bc_ops = dp->bc_ops;
error = xfs_ag_init_hdr(mp, id, dp->work, dp->ops); error = xfs_ag_init_hdr(mp, id, dp->work, dp->ops);
if (error) if (error)
break; break;

2
fs/xfs/libxfs/xfs_ag.h
View file

@ -331,7 +331,7 @@ struct aghdr_init_data {
/* per header data */ /* per header data */
xfs_daddr_t daddr; /* header location */ xfs_daddr_t daddr; /* header location */
size_t numblks; /* size of header */ size_t numblks; /* size of header */
xfs_btnum_t type; /* type of btree root block */ const struct xfs_btree_ops *bc_ops; /* btree ops */
}; };
int xfs_ag_init_headers(struct xfs_mount *mp, struct aghdr_init_data *id); int xfs_ag_init_headers(struct xfs_mount *mp, struct aghdr_init_data *id);

8
fs/xfs/libxfs/xfs_bmap.c
View file

@ -644,9 +644,7 @@ xfs_bmap_extents_to_btree(
* Fill in the root. * Fill in the root.
*/ */
block = ifp->if_broot; block = ifp->if_broot;
xfs_btree_init_block_int(mp, block, XFS_BUF_DADDR_NULL, xfs_bmbt_init_block(ip, block, NULL, 1, 1);
XFS_BTNUM_BMAP, 1, 1, ip->i_ino,
XFS_BTGEO_LONG_PTRS);
/* /*
* Need a cursor. Can't allocate until bb_level is filled in. * Need a cursor. Can't allocate until bb_level is filled in.
*/ */
@ -692,9 +690,7 @@ xfs_bmap_extents_to_btree(
*/ */
abp->b_ops = &xfs_bmbt_buf_ops; abp->b_ops = &xfs_bmbt_buf_ops;
ablock = XFS_BUF_TO_BLOCK(abp); ablock = XFS_BUF_TO_BLOCK(abp);
xfs_btree_init_block_int(mp, ablock, xfs_buf_daddr(abp), xfs_bmbt_init_block(ip, ablock, abp, 0, 0);
XFS_BTNUM_BMAP, 0, 0, ip->i_ino,
XFS_BTGEO_LONG_PTRS);
for_each_xfs_iext(ifp, &icur, &rec) { for_each_xfs_iext(ifp, &icur, &rec) {
if (isnullstartblock(rec.br_startblock)) if (isnullstartblock(rec.br_startblock))

20
fs/xfs/libxfs/xfs_bmap_btree.c
View file

@ -26,6 +26,22 @@
static struct kmem_cache *xfs_bmbt_cur_cache; static struct kmem_cache *xfs_bmbt_cur_cache;
void
xfs_bmbt_init_block(
struct xfs_inode *ip,
struct xfs_btree_block *buf,
struct xfs_buf *bp,
__u16 level,
__u16 numrecs)
{
if (bp)
xfs_btree_init_block(ip->i_mount, bp, &xfs_bmbt_ops, level,
numrecs, ip->i_ino);
else
xfs_btree_init_block_int(ip->i_mount, buf, &xfs_bmbt_ops,
XFS_BUF_DADDR_NULL, level, numrecs, ip->i_ino);
}
/* /*
* Convert on-disk form of btree root to in-memory form. * Convert on-disk form of btree root to in-memory form.
*/ */
@ -44,9 +60,7 @@ xfs_bmdr_to_bmbt(
xfs_bmbt_key_t *tkp; xfs_bmbt_key_t *tkp;
__be64 *tpp; __be64 *tpp;
xfs_btree_init_block_int(mp, rblock, XFS_BUF_DADDR_NULL, xfs_bmbt_init_block(ip, rblock, NULL, 0, 0);
XFS_BTNUM_BMAP, 0, 0, ip->i_ino,
XFS_BTGEO_LONG_PTRS);
rblock->bb_level = dblock->bb_level; rblock->bb_level = dblock->bb_level;
ASSERT(be16_to_cpu(rblock->bb_level) > 0); ASSERT(be16_to_cpu(rblock->bb_level) > 0);
rblock->bb_numrecs = dblock->bb_numrecs; rblock->bb_numrecs = dblock->bb_numrecs;

3
fs/xfs/libxfs/xfs_bmap_btree.h
View file

@ -120,4 +120,7 @@ unsigned int xfs_bmbt_maxlevels_ondisk(void);
int __init xfs_bmbt_init_cur_cache(void); int __init xfs_bmbt_init_cur_cache(void);
void xfs_bmbt_destroy_cur_cache(void); void xfs_bmbt_destroy_cur_cache(void);
void xfs_bmbt_init_block(struct xfs_inode *ip, struct xfs_btree_block *buf,
struct xfs_buf *bp, __u16 level, __u16 numrecs);
#endif /* __XFS_BMAP_BTREE_H__ */ #endif /* __XFS_BMAP_BTREE_H__ */

57
fs/xfs/libxfs/xfs_btree.c
View file

@ -32,24 +32,17 @@
/* /*
* Btree magic numbers. * Btree magic numbers.
*/ */
static const uint32_t xfs_magics[2][XFS_BTNUM_MAX] = {
{ XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, 0, XFS_BMAP_MAGIC, XFS_IBT_MAGIC,
XFS_FIBT_MAGIC, 0 },
{ XFS_ABTB_CRC_MAGIC, XFS_ABTC_CRC_MAGIC, XFS_RMAP_CRC_MAGIC,
XFS_BMAP_CRC_MAGIC, XFS_IBT_CRC_MAGIC, XFS_FIBT_CRC_MAGIC,
XFS_REFC_CRC_MAGIC }
};
uint32_t uint32_t
xfs_btree_magic( xfs_btree_magic(
int crc, struct xfs_mount *mp,
xfs_btnum_t btnum) const struct xfs_btree_ops *ops)
{ {
uint32_t magic = xfs_magics[crc][btnum]; int idx = xfs_has_crc(mp) ? 1 : 0;
__be32 magic = ops->buf_ops->magic[idx];
/* Ensure we asked for crc for crc-only magics. */ /* Ensure we asked for crc for crc-only magics. */
ASSERT(magic != 0); ASSERT(magic != 0);
return magic; return be32_to_cpu(magic);
} }
/* /*
@ -128,8 +121,7 @@ __xfs_btree_check_lblock(
struct xfs_buf *bp) struct xfs_buf *bp)
{ {
struct xfs_mount *mp = cur->bc_mp; struct xfs_mount *mp = cur->bc_mp;
xfs_btnum_t btnum = cur->bc_btnum; bool crc = xfs_has_crc(mp);
int crc = xfs_has_crc(mp);
xfs_failaddr_t fa; xfs_failaddr_t fa;
xfs_fsblock_t fsb = NULLFSBLOCK; xfs_fsblock_t fsb = NULLFSBLOCK;
@ -143,7 +135,7 @@ __xfs_btree_check_lblock(
return __this_address; return __this_address;
} }
if (be32_to_cpu(block->bb_magic) != xfs_btree_magic(crc, btnum)) if (be32_to_cpu(block->bb_magic) != xfs_btree_magic(mp, cur->bc_ops))
return __this_address; return __this_address;
if (be16_to_cpu(block->bb_level) != level) if (be16_to_cpu(block->bb_level) != level)
return __this_address; return __this_address;
@ -197,8 +189,7 @@ __xfs_btree_check_sblock(
{ {
struct xfs_mount *mp = cur->bc_mp; struct xfs_mount *mp = cur->bc_mp;
struct xfs_perag *pag = cur->bc_ag.pag; struct xfs_perag *pag = cur->bc_ag.pag;
xfs_btnum_t btnum = cur->bc_btnum; bool crc = xfs_has_crc(mp);
int crc = xfs_has_crc(mp);
xfs_failaddr_t fa; xfs_failaddr_t fa;
xfs_agblock_t agbno = NULLAGBLOCK; xfs_agblock_t agbno = NULLAGBLOCK;
@ -210,7 +201,7 @@ __xfs_btree_check_sblock(
return __this_address; return __this_address;
} }
if (be32_to_cpu(block->bb_magic) != xfs_btree_magic(crc, btnum)) if (be32_to_cpu(block->bb_magic) != xfs_btree_magic(mp, cur->bc_ops))
return __this_address; return __this_address;
if (be16_to_cpu(block->bb_level) != level) if (be16_to_cpu(block->bb_level) != level)
return __this_address; return __this_address;
@ -1166,21 +1157,20 @@ void
xfs_btree_init_block_int( xfs_btree_init_block_int(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_btree_block *buf, struct xfs_btree_block *buf,
const struct xfs_btree_ops *ops,
xfs_daddr_t blkno, xfs_daddr_t blkno,
xfs_btnum_t btnum,
__u16 level, __u16 level,
__u16 numrecs, __u16 numrecs,
__u64 owner, __u64 owner)
unsigned int geom_flags)
{ {
bool crc = xfs_has_crc(mp); bool crc = xfs_has_crc(mp);
__u32 magic = xfs_btree_magic(crc, btnum); __u32 magic = xfs_btree_magic(mp, ops);
buf->bb_magic = cpu_to_be32(magic); buf->bb_magic = cpu_to_be32(magic);
buf->bb_level = cpu_to_be16(level); buf->bb_level = cpu_to_be16(level);
buf->bb_numrecs = cpu_to_be16(numrecs); buf->bb_numrecs = cpu_to_be16(numrecs);
if (geom_flags & XFS_BTGEO_LONG_PTRS) { if (ops->geom_flags & XFS_BTGEO_LONG_PTRS) {
buf->bb_u.l.bb_leftsib = cpu_to_be64(NULLFSBLOCK); buf->bb_u.l.bb_leftsib = cpu_to_be64(NULLFSBLOCK);
buf->bb_u.l.bb_rightsib = cpu_to_be64(NULLFSBLOCK); buf->bb_u.l.bb_rightsib = cpu_to_be64(NULLFSBLOCK);
if (crc) { if (crc) {
@ -1207,15 +1197,15 @@ xfs_btree_init_block_int(
void void
xfs_btree_init_block( xfs_btree_init_block(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_buf *bp, struct xfs_buf *bp,
xfs_btnum_t btnum, const struct xfs_btree_ops *ops,
__u16 level, __u16 level,
__u16 numrecs, __u16 numrecs,
__u64 owner) __u64 owner)
{ {
xfs_btree_init_block_int(mp, XFS_BUF_TO_BLOCK(bp), xfs_buf_daddr(bp), xfs_btree_init_block_int(mp, XFS_BUF_TO_BLOCK(bp), ops,
btnum, level, numrecs, owner, 0); xfs_buf_daddr(bp), level, numrecs, owner);
} }
void void
@ -1238,9 +1228,8 @@ xfs_btree_init_block_cur(
else else
owner = cur->bc_ag.pag->pag_agno; owner = cur->bc_ag.pag->pag_agno;
xfs_btree_init_block_int(cur->bc_mp, XFS_BUF_TO_BLOCK(bp), xfs_btree_init_block_int(cur->bc_mp, XFS_BUF_TO_BLOCK(bp), cur->bc_ops,
xfs_buf_daddr(bp), cur->bc_btnum, level, xfs_buf_daddr(bp), level, numrecs, owner);
numrecs, owner, cur->bc_ops->geom_flags);
} }
/* /*

28
fs/xfs/libxfs/xfs_btree.h
View file

@ -63,7 +63,8 @@ union xfs_btree_rec {
#define XFS_BTNUM_RMAP ((xfs_btnum_t)XFS_BTNUM_RMAPi) #define XFS_BTNUM_RMAP ((xfs_btnum_t)XFS_BTNUM_RMAPi)
#define XFS_BTNUM_REFC ((xfs_btnum_t)XFS_BTNUM_REFCi) #define XFS_BTNUM_REFC ((xfs_btnum_t)XFS_BTNUM_REFCi)
uint32_t xfs_btree_magic(int crc, xfs_btnum_t btnum); struct xfs_btree_ops;
uint32_t xfs_btree_magic(struct xfs_mount *mp, const struct xfs_btree_ops *ops);
/* /*
* For logging record fields. * For logging record fields.
@ -434,25 +435,12 @@ xfs_btree_reada_bufs(
/* /*
* Initialise a new btree block header * Initialise a new btree block header
*/ */
void void xfs_btree_init_block(struct xfs_mount *mp, struct xfs_buf *bp,
xfs_btree_init_block( const struct xfs_btree_ops *ops, __u16 level, __u16 numrecs,
struct xfs_mount *mp, __u64 owner);
struct xfs_buf *bp, void xfs_btree_init_block_int(struct xfs_mount *mp,
xfs_btnum_t btnum, struct xfs_btree_block *buf, const struct xfs_btree_ops *ops,
__u16 level, xfs_daddr_t blkno, __u16 level, __u16 numrecs, __u64 owner);
__u16 numrecs,
__u64 owner);
void
xfs_btree_init_block_int(
struct xfs_mount *mp,
struct xfs_btree_block *buf,
xfs_daddr_t blkno,
xfs_btnum_t btnum,
__u16 level,
__u16 numrecs,
__u64 owner,
unsigned int geom_flags);
/* /*
* Common btree core entry points. * Common btree core entry points.

5
fs/xfs/libxfs/xfs_btree_staging.c
View file

@ -411,9 +411,8 @@ xfs_btree_bload_prep_block(
/* Initialize it and send it out. */ /* Initialize it and send it out. */
xfs_btree_init_block_int(cur->bc_mp, ifp->if_broot, xfs_btree_init_block_int(cur->bc_mp, ifp->if_broot,
XFS_BUF_DADDR_NULL, cur->bc_btnum, level, cur->bc_ops, XFS_BUF_DADDR_NULL, level,
nr_this_block, cur->bc_ino.ip->i_ino, nr_this_block, cur->bc_ino.ip->i_ino);
cur->bc_ops->geom_flags);
*bpp = NULL; *bpp = NULL;
*blockp = ifp->if_broot; *blockp = ifp->if_broot;