* Fill in the root.
*/
block = ifp->if_broot;
- if (xfs_sb_version_hascrc(&mp->m_sb))
- xfs_btree_init_block_int(mp, block, XFS_BUF_DADDR_NULL,
- XFS_BMAP_CRC_MAGIC, 1, 1, ip->i_ino,
+ xfs_btree_init_block_int(mp, block, XFS_BUF_DADDR_NULL,
+ XFS_BTNUM_BMAP, 1, 1, ip->i_ino,
XFS_BTREE_LONG_PTRS);
- else
- xfs_btree_init_block_int(mp, block, XFS_BUF_DADDR_NULL,
- XFS_BMAP_MAGIC, 1, 1, ip->i_ino,
- XFS_BTREE_LONG_PTRS);
-
/*
* Need a cursor. Can't allocate until bb_level is filled in.
*/
*/
abp->b_ops = &xfs_bmbt_buf_ops;
ablock = XFS_BUF_TO_BLOCK(abp);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- xfs_btree_init_block_int(mp, ablock, abp->b_bn,
- XFS_BMAP_CRC_MAGIC, 0, 0, ip->i_ino,
- XFS_BTREE_LONG_PTRS);
- else
- xfs_btree_init_block_int(mp, ablock, abp->b_bn,
- XFS_BMAP_MAGIC, 0, 0, ip->i_ino,
+ xfs_btree_init_block_int(mp, ablock, abp->b_bn,
+ XFS_BTNUM_BMAP, 0, 0, ip->i_ino,
XFS_BTREE_LONG_PTRS);
arp = XFS_BMBT_REC_ADDR(mp, ablock, 1);
xfs_bmbt_key_t *tkp;
__be64 *tpp;
- if (xfs_sb_version_hascrc(&mp->m_sb))
- xfs_btree_init_block_int(mp, rblock, XFS_BUF_DADDR_NULL,
- XFS_BMAP_CRC_MAGIC, 0, 0, ip->i_ino,
- XFS_BTREE_LONG_PTRS);
- else
- xfs_btree_init_block_int(mp, rblock, XFS_BUF_DADDR_NULL,
- XFS_BMAP_MAGIC, 0, 0, ip->i_ino,
+ xfs_btree_init_block_int(mp, rblock, XFS_BUF_DADDR_NULL,
+ XFS_BTNUM_BMAP, 0, 0, ip->i_ino,
XFS_BTREE_LONG_PTRS);
-
rblock->bb_level = dblock->bb_level;
ASSERT(be16_to_cpu(rblock->bb_level) > 0);
rblock->bb_numrecs = dblock->bb_numrecs;
struct xfs_mount *mp,
struct xfs_btree_block *buf,
xfs_daddr_t blkno,
- __u32 magic,
+ xfs_btnum_t btnum,
__u16 level,
__u16 numrecs,
__u64 owner,
unsigned int flags)
{
int crc = xfs_sb_version_hascrc(&mp->m_sb);
+ __u32 magic = xfs_btree_magic(crc, btnum);
buf->bb_magic = cpu_to_be32(magic);
buf->bb_level = cpu_to_be16(level);
xfs_btree_init_block(
struct xfs_mount *mp,
struct xfs_buf *bp,
- __u32 magic,
+ xfs_btnum_t btnum,
__u16 level,
__u16 numrecs,
__u64 owner,
unsigned int flags)
{
xfs_btree_init_block_int(mp, XFS_BUF_TO_BLOCK(bp), bp->b_bn,
- magic, level, numrecs, owner, flags);
+ btnum, level, numrecs, owner, flags);
}
STATIC void
int numrecs)
{
__u64 owner;
- int crc = xfs_sb_version_hascrc(&cur->bc_mp->m_sb);
- xfs_btnum_t btnum = cur->bc_btnum;
/*
* we can pull the owner from the cursor right now as the different
owner = cur->bc_private.a.agno;
xfs_btree_init_block_int(cur->bc_mp, XFS_BUF_TO_BLOCK(bp), bp->b_bn,
- xfs_btree_magic(crc, btnum), level, numrecs,
+ cur->bc_btnum, level, numrecs,
owner, cur->bc_flags);
}
xfs_btree_init_block(
struct xfs_mount *mp,
struct xfs_buf *bp,
- __u32 magic,
+ xfs_btnum_t btnum,
__u16 level,
__u16 numrecs,
__u64 owner,
struct xfs_mount *mp,
struct xfs_btree_block *buf,
xfs_daddr_t blkno,
- __u32 magic,
+ xfs_btnum_t btnum,
__u16 level,
__u16 numrecs,
__u64 owner,
buf->b_ops = &xfs_allocbt_buf_ops;
block = XFS_BUF_TO_BLOCK(buf);
memset(block, 0, blocksize);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- libxfs_btree_init_block(mp, buf, XFS_ABTB_CRC_MAGIC, 0, 1,
- agno, 0);
- else
- libxfs_btree_init_block(mp, buf, XFS_ABTB_MAGIC, 0, 1,
- agno, 0);
+ libxfs_btree_init_block(mp, buf, XFS_BTNUM_BNO, 0, 1, agno, 0);
arec = XFS_ALLOC_REC_ADDR(mp, block, 1);
arec->ar_startblock = cpu_to_be32(libxfs_prealloc_blocks(mp));
buf->b_ops = &xfs_allocbt_buf_ops;
block = XFS_BUF_TO_BLOCK(buf);
memset(block, 0, blocksize);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- libxfs_btree_init_block(mp, buf, XFS_ABTC_CRC_MAGIC, 0, 1,
- agno, 0);
- else
- libxfs_btree_init_block(mp, buf, XFS_ABTC_MAGIC, 0, 1,
- agno, 0);
+ libxfs_btree_init_block(mp, buf, XFS_BTNUM_CNT, 0, 1, agno, 0);
arec = XFS_ALLOC_REC_ADDR(mp, block, 1);
arec->ar_startblock = cpu_to_be32(libxfs_prealloc_blocks(mp));
block = XFS_BUF_TO_BLOCK(buf);
memset(block, 0, blocksize);
- libxfs_btree_init_block(mp, buf, XFS_REFC_CRC_MAGIC, 0,
+ libxfs_btree_init_block(mp, buf, XFS_BTNUM_REFC, 0,
0, agno, 0);
libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
buf->b_ops = &xfs_inobt_buf_ops;
block = XFS_BUF_TO_BLOCK(buf);
memset(block, 0, blocksize);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- libxfs_btree_init_block(mp, buf, XFS_IBT_CRC_MAGIC, 0, 0,
- agno, 0);
- else
- libxfs_btree_init_block(mp, buf, XFS_IBT_MAGIC, 0, 0,
- agno, 0);
+ libxfs_btree_init_block(mp, buf, XFS_BTNUM_INO, 0, 0, agno, 0);
libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
/*
buf->b_ops = &xfs_inobt_buf_ops;
block = XFS_BUF_TO_BLOCK(buf);
memset(block, 0, blocksize);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- libxfs_btree_init_block(mp, buf, XFS_FIBT_CRC_MAGIC, 0, 0,
- agno, 0);
- else
- libxfs_btree_init_block(mp, buf, XFS_FIBT_MAGIC, 0, 0,
- agno, 0);
+ libxfs_btree_init_block(mp, buf, XFS_BTNUM_FINO, 0, 0, agno, 0);
libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
}
block = XFS_BUF_TO_BLOCK(buf);
memset(block, 0, blocksize);
- libxfs_btree_init_block(mp, buf, XFS_RMAP_CRC_MAGIC, 0, 0,
- agno, 0);
+ libxfs_btree_init_block(mp, buf, XFS_BTNUM_RMAP, 0, 0, agno, 0);
/*
* mark the AG header regions as static metadata
xfs_alloc_ptr_t *bt_ptr;
xfs_agblock_t agbno;
bt_stat_level_t *lptr;
- __uint32_t crc_magic;
+ xfs_btnum_t btnum;
if (magic == XFS_ABTB_MAGIC)
- crc_magic = XFS_ABTB_CRC_MAGIC;
+ btnum = XFS_BTNUM_BNO;
else
- crc_magic = XFS_ABTC_CRC_MAGIC;
+ btnum = XFS_BTNUM_CNT;
level++;
lptr->buf_p->b_ops = &xfs_allocbt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- libxfs_btree_init_block(mp, lptr->buf_p, crc_magic, level,
- 0, agno, 0);
- else
- libxfs_btree_init_block(mp, lptr->buf_p, magic, level,
- 0, agno, 0);
+ libxfs_btree_init_block(mp, lptr->buf_p, btnum, level,
+ 0, agno, 0);
bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
extent_tree_node_t *ext_ptr;
bt_stat_level_t *lptr;
xfs_extlen_t freeblks;
- __uint32_t crc_magic;
+ xfs_btnum_t btnum;
#ifdef XR_BLD_FREE_TRACE
fprintf(stderr, "in build_freespace_tree, agno = %d\n", agno);
ASSERT(level > 0);
if (magic == XFS_ABTB_MAGIC)
- crc_magic = XFS_ABTB_CRC_MAGIC;
+ btnum = XFS_BTNUM_BNO;
else
- crc_magic = XFS_ABTC_CRC_MAGIC;
+ btnum = XFS_BTNUM_CNT;
/*
* initialize the first block on each btree level
lptr->buf_p->b_ops = &xfs_allocbt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- libxfs_btree_init_block(mp, lptr->buf_p, crc_magic, i,
- 0, agno, 0);
- else
- libxfs_btree_init_block(mp, lptr->buf_p, magic, i,
- 0, agno, 0);
+ libxfs_btree_init_block(mp, lptr->buf_p, btnum, i, 0, agno, 0);
}
/*
* run along leaf, setting up records. as we have to switch
lptr->buf_p->b_ops = &xfs_allocbt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- libxfs_btree_init_block(mp, lptr->buf_p, crc_magic, 0,
- 0, agno, 0);
- else
- libxfs_btree_init_block(mp, lptr->buf_p, magic, 0,
- 0, agno, 0);
+ libxfs_btree_init_block(mp, lptr->buf_p, btnum, 0, 0, agno, 0);
bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
bt_hdr->bb_numrecs = cpu_to_be16(lptr->num_recs_pb +
lptr->buf_p->b_ops = &xfs_inobt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- libxfs_btree_init_block(mp, lptr->buf_p, XFS_IBT_CRC_MAGIC,
- level, 0, agno,
- 0);
- else
- libxfs_btree_init_block(mp, lptr->buf_p, XFS_IBT_MAGIC,
- level, 0, agno, 0);
+ libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_INO,
+ level, 0, agno, 0);
bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
int spmask;
uint64_t sparse;
uint16_t holemask;
+ xfs_btnum_t btnum;
+
+ if (magic == XFS_IBT_CRC_MAGIC || magic == XFS_IBT_MAGIC)
+ btnum = XFS_BTNUM_INO;
+ else if (magic == XFS_FIBT_CRC_MAGIC || magic == XFS_FIBT_MAGIC)
+ btnum = XFS_BTNUM_FINO;
+ else
+ ASSERT(0);
for (i = 0; i < level; i++) {
lptr = &btree_curs->level[i];
lptr->buf_p->b_ops = &xfs_inobt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- libxfs_btree_init_block(mp, lptr->buf_p, magic,
- i, 0, agno,
- 0);
- else
- libxfs_btree_init_block(mp, lptr->buf_p, magic,
- i, 0, agno, 0);
+ libxfs_btree_init_block(mp, lptr->buf_p, btnum, i, 0, agno, 0);
}
/*
lptr->buf_p->b_ops = &xfs_inobt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- if (xfs_sb_version_hascrc(&mp->m_sb))
- libxfs_btree_init_block(mp, lptr->buf_p, magic,
- 0, 0, agno, 0);
- else
- libxfs_btree_init_block(mp, lptr->buf_p, magic,
- 0, 0, agno, 0);
+ libxfs_btree_init_block(mp, lptr->buf_p, btnum, 0, 0, agno, 0);
bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
bt_hdr->bb_numrecs = cpu_to_be16(lptr->num_recs_pb +
lptr->buf_p->b_ops = &xfs_rmapbt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- libxfs_btree_init_block(mp, lptr->buf_p, XFS_RMAP_CRC_MAGIC,
+ libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_RMAP,
level, 0, agno, 0);
bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
lptr->buf_p->b_ops = &xfs_rmapbt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- libxfs_btree_init_block(mp, lptr->buf_p, XFS_RMAP_CRC_MAGIC,
+ libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_RMAP,
i, 0, agno, 0);
}
lptr->buf_p->b_ops = &xfs_rmapbt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- libxfs_btree_init_block(mp, lptr->buf_p, XFS_RMAP_CRC_MAGIC,
+ libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_RMAP,
0, 0, agno, 0);
bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
lptr->buf_p->b_ops = &xfs_refcountbt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- libxfs_btree_init_block(mp, lptr->buf_p, XFS_REFC_CRC_MAGIC,
+ libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_REFC,
level, 0, agno, 0);
bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);
lptr->buf_p->b_ops = &xfs_refcountbt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- libxfs_btree_init_block(mp, lptr->buf_p, XFS_REFC_CRC_MAGIC,
+ libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_REFC,
i, 0, agno, 0);
}
lptr->buf_p->b_ops = &xfs_refcountbt_buf_ops;
bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p);
memset(bt_hdr, 0, mp->m_sb.sb_blocksize);
- libxfs_btree_init_block(mp, lptr->buf_p, XFS_REFC_CRC_MAGIC,
+ libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_REFC,
0, 0, agno, 0);
bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno);