[083/111] xfs: rename btree helpers that depends on the block number representation

Message ID	171744040617.1443973.324671867894022937.stgit@frogsfrogsfrogs (mailing list archive)
State	Accepted, archived
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C59513C9A2 for <linux-xfs@vger.kernel.org>; Mon, 3 Jun 2024 19:13:41 +0000 (UTC) Date: Mon, 03 Jun 2024 12:13:41 -0700 Subject: [PATCH 083/111] xfs: rename btree helpers that depends on the block number representation From: "Darrick J. Wong" <djwong@kernel.org> To: djwong@kernel.org, cem@kernel.org Cc: Christoph Hellwig <hch@lst.de>, Carlos Maiolino <cmaiolino@redhat.com>, linux-xfs@vger.kernel.org Message-ID: <171744040617.1443973.324671867894022937.stgit@frogsfrogsfrogs> In-Reply-To: <171744039240.1443973.5959953049110025783.stgit@frogsfrogsfrogs> References: <171744039240.1443973.5959953049110025783.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit
Series	[001/111] xfs: convert kmem_zalloc() to kzalloc() \| expand [001/111] xfs: convert kmem_zalloc() to kzalloc() [002/111] xfs: convert kmem_alloc() to kmalloc() [003/111] xfs: convert remaining kmem_free() to kfree() [004/111] xfs: use __GFP_NOLOCKDEP instead of GFP_NOFS [005/111] xfs: use GFP_KERNEL in pure transaction contexts [006/111] xfs: clean up remaining GFP_NOFS users [007/111] xfs: use xfs_defer_alloc a bit more [008/111] xfs: Replace xfs_isilocked with xfs_assert_ilocked [009/111] xfs: create a static name for the dot entry too [010/111] xfs: create a predicate to determine if two xfs_names are the same [011/111] xfs: create a macro for decoding ftypes in tracepoints [012/111] xfs: report the health of quota counts [013/111] xfs: implement live quotacheck inode scan [014/111] xfs: report health of inode link counts [015/111] xfs: teach scrub to check file nlinks [016/111] xfs: separate the marking of sick and checked metadata [017/111] xfs: report fs corruption errors to the health tracking system [018/111] xfs: report ag header corruption errors to the health tracking system [019/111] xfs: report block map corruption errors to the health tracking system [020/111] xfs: report btree block corruption errors to the health system [021/111] xfs: report dir/attr block corruption errors to the health system [022/111] xfs: report inode corruption errors to the health system [023/111] xfs: report realtime metadata corruption errors to the health system [024/111] xfs: report XFS_IS_CORRUPT errors to the health system [025/111] xfs: add secondary and indirect classes to the health tracking system [026/111] xfs: remember sick inodes that get inactivated [027/111] xfs: update health status if we get a clean bill of health [028/111] xfs: consolidate btree block freeing tracepoints [029/111] xfs: consolidate btree block allocation tracepoints [030/111] xfs: set the btree cursor bc_ops in xfs_btree_alloc_cursor [031/111] xfs: drop XFS_BTREE_CRC_BLOCKS [032/111] xfs: encode the btree geometry flags in the btree ops structure [033/111] xfs: remove bc_ino.flags [034/111] xfs: consolidate the xfs_alloc_lookup_* helpers [035/111] xfs: turn the allocbt cursor active field into a btree flag [036/111] xfs: extern some btree ops structures [037/111] xfs: initialize btree blocks using btree_ops structure [038/111] xfs: rename btree block/buffer init functions [039/111] xfs: btree convert xfs_btree_init_block to xfs_btree_init_buf calls [040/111] xfs: remove the unnecessary daddr paramter to _init_block [041/111] xfs: set btree block buffer ops in _init_buf [042/111] xfs: move lru refs to the btree ops structure [043/111] xfs: move the btree stats offset into struct btree_ops [044/111] xfs: factor out a xfs_btree_owner helper [045/111] xfs: factor out a btree block owner check [046/111] xfs: store the btree pointer length in struct xfs_btree_ops [047/111] xfs: split out a btree type from the btree ops geometry flags [048/111] xfs: split the per-btree union in struct xfs_btree_cur [049/111] xfs: create predicate to determine if cursor is at inode root level [050/111] xfs: move comment about two 2 keys per pointer in the rmap btree [051/111] xfs: add a xfs_btree_init_ptr_from_cur [052/111] xfs: don't override bc_ops for staging btrees [053/111] xfs: fold xfs_allocbt_init_common into xfs_allocbt_init_cursor [054/111] xfs: remove xfs_allocbt_stage_cursor [055/111] xfs: fold xfs_inobt_init_common into xfs_inobt_init_cursor [056/111] xfs: remove xfs_inobt_stage_cursor [057/111] xfs: fold xfs_refcountbt_init_common into xfs_refcountbt_init_cursor [058/111] xfs: remove xfs_refcountbt_stage_cursor [059/111] xfs: fold xfs_rmapbt_init_common into xfs_rmapbt_init_cursor [060/111] xfs: remove xfs_rmapbt_stage_cursor [061/111] xfs: make full use of xfs_btree_stage_ifakeroot in xfs_bmbt_stage_cursor [062/111] xfs: make staging file forks explicit [063/111] xfs: fold xfs_bmbt_init_common into xfs_bmbt_init_cursor [064/111] xfs: remove xfs_bmbt_stage_cursor [065/111] xfs: split the agf_roots and agf_levels arrays [066/111] xfs: add a name field to struct xfs_btree_ops [067/111] xfs: add a sick_mask to struct xfs_btree_ops [068/111] xfs: split xfs_allocbt_init_cursor [069/111] xfs: remove xfs_inobt_cur [070/111] xfs: remove the btnum argument to xfs_inobt_count_blocks [071/111] xfs: split xfs_inobt_insert_sprec [072/111] xfs: split xfs_inobt_init_cursor [073/111] xfs: pass a 'bool is_finobt' to xfs_inobt_insert [074/111] xfs: remove xfs_btnum_t [075/111] xfs: simplify xfs_btree_check_sblock_siblings [076/111] xfs: simplify xfs_btree_check_lblock_siblings [077/111] xfs: open code xfs_btree_check_lptr in xfs_bmap_btree_to_extents [078/111] xfs: consolidate btree ptr checking [079/111] xfs: misc cleanups for __xfs_btree_check_sblock [080/111] xfs: remove the crc variable in __xfs_btree_check_lblock [081/111] xfs: tighten up validation of root block in inode forks [082/111] xfs: consolidate btree block verification [083/111] xfs: rename btree helpers that depends on the block number representation [084/111] xfs: factor out a __xfs_btree_check_lblock_hdr helper [085/111] xfs: remove xfs_btree_reada_bufl [086/111] xfs: remove xfs_btree_reada_bufs [087/111] xfs: move and rename xfs_btree_read_bufl [088/111] libxfs: teach buftargs to maintain their own buffer hashtable [089/111] libxfs: add xfile support [090/111] libxfs: partition memfd files to avoid using too many fds [091/111] xfs: teach buftargs to maintain their own buffer hashtable [092/111] libxfs: support in-memory buffer cache targets [093/111] xfs: add a xfs_btree_ptrs_equal helper [094/111] xfs: support in-memory btrees [095/111] xfs: launder in-memory btree buffers before transaction commit [096/111] xfs: create a helper to decide if a file mapping targets the rt volume [097/111] xfs: repair the rmapbt [098/111] xfs: create a shadow rmap btree during rmap repair [099/111] xfs: hook live rmap operations during a repair operation [100/111] xfs: clean up bmap log intent item tracepoint callsites [101/111] xfs: move xfs_bmap_defer_add to xfs_bmap_item.c [102/111] xfs: fix xfs_bunmapi to allow unmapping of partial rt extents [103/111] xfs: add a realtime flag to the bmap update log redo items [104/111] xfs: support deferred bmap updates on the attr fork [105/111] xfs: xfs_bmap_finish_one should map unwritten extents properly [106/111] xfs: move xfs_symlink_remote.c declarations to xfs_symlink_remote.h [107/111] xfs: move remote symlink target read function to libxfs [108/111] xfs: move symlink target write function to libxfs [109/111] xfs: xfs_btree_bload_prep_block() should use __GFP_NOFAIL [110/111] xfs: shrink failure needs to hold AGI buffer [111/111] xfs: allow sunit mount option to repair bad primary sb stripe values

diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c index 35d3dde42..949eb02cd 100644 --- a/libxfs/xfs_alloc_btree.c +++ b/libxfs/xfs_alloc_btree.c @@ -320,7 +320,7 @@ xfs_allocbt_verify( return __this_address; if (xfs_has_crc(mp)) { - fa = xfs_btree_sblock_v5hdr_verify(bp); + fa = xfs_btree_agblock_v5hdr_verify(bp); if (fa) return fa; } @@ -360,7 +360,7 @@ xfs_allocbt_verify( } else if (level >= mp->m_alloc_maxlevels) return __this_address; - return xfs_btree_sblock_verify(bp, mp->m_alloc_mxr[level != 0]); + return xfs_btree_agblock_verify(bp, mp->m_alloc_mxr[level != 0]); } static void @@ -369,7 +369,7 @@ xfs_allocbt_read_verify( { xfs_failaddr_t fa; - if (!xfs_btree_sblock_verify_crc(bp)) + if (!xfs_btree_agblock_verify_crc(bp)) xfs_verifier_error(bp, -EFSBADCRC, __this_address); else { fa = xfs_allocbt_verify(bp); @@ -393,7 +393,7 @@ xfs_allocbt_write_verify( xfs_verifier_error(bp, -EFSCORRUPTED, fa); return; } - xfs_btree_sblock_calc_crc(bp); + xfs_btree_agblock_calc_crc(bp); } diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c index eede6ffd6..2a603b4d1 100644 --- a/libxfs/xfs_bmap_btree.c +++ b/libxfs/xfs_bmap_btree.c @@ -419,7 +419,7 @@ xfs_bmbt_verify( * XXX: need a better way of verifying the owner here. Right now * just make sure there has been one set. */ - fa = xfs_btree_lblock_v5hdr_verify(bp, XFS_RMAP_OWN_UNKNOWN); + fa = xfs_btree_fsblock_v5hdr_verify(bp, XFS_RMAP_OWN_UNKNOWN); if (fa) return fa; } @@ -435,7 +435,7 @@ xfs_bmbt_verify( if (level > max(mp->m_bm_maxlevels[0], mp->m_bm_maxlevels[1])) return __this_address; - return xfs_btree_lblock_verify(bp, mp->m_bmap_dmxr[level != 0]); + return xfs_btree_fsblock_verify(bp, mp->m_bmap_dmxr[level != 0]); } static void @@ -444,7 +444,7 @@ xfs_bmbt_read_verify( { xfs_failaddr_t fa; - if (!xfs_btree_lblock_verify_crc(bp)) + if (!xfs_btree_fsblock_verify_crc(bp)) xfs_verifier_error(bp, -EFSBADCRC, __this_address); else { fa = xfs_bmbt_verify(bp); @@ -468,7 +468,7 @@ xfs_bmbt_write_verify( xfs_verifier_error(bp, -EFSCORRUPTED, fa); return; } - xfs_btree_lblock_calc_crc(bp); + xfs_btree_fsblock_calc_crc(bp); } const struct xfs_buf_ops xfs_bmbt_buf_ops = { diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c index fae121ace..e69b88b90 100644 --- a/libxfs/xfs_btree.c +++ b/libxfs/xfs_btree.c @@ -54,7 +54,7 @@ xfs_btree_magic( * bytes. */ static inline xfs_failaddr_t -xfs_btree_check_lblock_siblings( +xfs_btree_check_fsblock_siblings( struct xfs_mount *mp, xfs_fsblock_t fsb, __be64 dsibling) @@ -73,7 +73,7 @@ xfs_btree_check_lblock_siblings( } static inline xfs_failaddr_t -xfs_btree_check_sblock_siblings( +xfs_btree_check_agblock_siblings( struct xfs_perag *pag, xfs_agblock_t agbno, __be32 dsibling) @@ -96,7 +96,7 @@ xfs_btree_check_sblock_siblings( * or NULL if everything is ok. */ static xfs_failaddr_t -__xfs_btree_check_lblock( +__xfs_btree_check_fsblock( struct xfs_btree_cur *cur, struct xfs_btree_block *block, int level, @@ -137,9 +137,10 @@ __xfs_btree_check_lblock( } fsb = XFS_DADDR_TO_FSB(mp, xfs_buf_daddr(bp)); - fa = xfs_btree_check_lblock_siblings(mp, fsb, block->bb_u.l.bb_leftsib); + fa = xfs_btree_check_fsblock_siblings(mp, fsb, + block->bb_u.l.bb_leftsib); if (!fa) - fa = xfs_btree_check_lblock_siblings(mp, fsb, + fa = xfs_btree_check_fsblock_siblings(mp, fsb, block->bb_u.l.bb_rightsib); return fa; } @@ -149,7 +150,7 @@ __xfs_btree_check_lblock( * or NULL if everything is ok. */ static xfs_failaddr_t -__xfs_btree_check_sblock( +__xfs_btree_check_agblock( struct xfs_btree_cur *cur, struct xfs_btree_block *block, int level, @@ -176,10 +177,10 @@ __xfs_btree_check_sblock( return __this_address; agbno = xfs_daddr_to_agbno(mp, xfs_buf_daddr(bp)); - fa = xfs_btree_check_sblock_siblings(pag, agbno, + fa = xfs_btree_check_agblock_siblings(pag, agbno, block->bb_u.s.bb_leftsib); if (!fa) - fa = xfs_btree_check_sblock_siblings(pag, agbno, + fa = xfs_btree_check_agblock_siblings(pag, agbno, block->bb_u.s.bb_rightsib); return fa; } @@ -196,9 +197,9 @@ __xfs_btree_check_block( int level, struct xfs_buf *bp) { - if (cur->bc_ops->ptr_len == XFS_BTREE_SHORT_PTR_LEN) - return __xfs_btree_check_sblock(cur, block, level, bp); - return __xfs_btree_check_lblock(cur, block, level, bp); + if (cur->bc_ops->type == XFS_BTREE_TYPE_AG) + return __xfs_btree_check_agblock(cur, block, level, bp); + return __xfs_btree_check_fsblock(cur, block, level, bp); } static inline unsigned int xfs_btree_block_errtag(struct xfs_btree_cur *cur) @@ -242,7 +243,7 @@ __xfs_btree_check_ptr( if (level <= 0) return -EFSCORRUPTED; - if (cur->bc_ops->ptr_len == XFS_BTREE_LONG_PTR_LEN) { + if (cur->bc_ops->type == XFS_BTREE_TYPE_INODE) { if (!xfs_verify_fsbno(cur->bc_mp, be64_to_cpu((&ptr->l)[index]))) return -EFSCORRUPTED; @@ -270,7 +271,7 @@ xfs_btree_check_ptr( error = __xfs_btree_check_ptr(cur, ptr, index, level); if (error) { - if (cur->bc_ops->ptr_len == XFS_BTREE_LONG_PTR_LEN) { + if (cur->bc_ops->type == XFS_BTREE_TYPE_INODE) { xfs_err(cur->bc_mp, "Inode %llu fork %d: Corrupt %sbt pointer at level %d index %d.", cur->bc_ino.ip->i_ino, @@ -303,7 +304,7 @@ xfs_btree_check_ptr( * it to disk. */ void -xfs_btree_lblock_calc_crc( +xfs_btree_fsblock_calc_crc( struct xfs_buf *bp) { struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); @@ -317,7 +318,7 @@ xfs_btree_lblock_calc_crc( } bool -xfs_btree_lblock_verify_crc( +xfs_btree_fsblock_verify_crc( struct xfs_buf *bp) { struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); @@ -341,7 +342,7 @@ xfs_btree_lblock_verify_crc( * it to disk. */ void -xfs_btree_sblock_calc_crc( +xfs_btree_agblock_calc_crc( struct xfs_buf *bp) { struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); @@ -355,7 +356,7 @@ xfs_btree_sblock_calc_crc( } bool -xfs_btree_sblock_verify_crc( +xfs_btree_agblock_verify_crc( struct xfs_buf *bp) { struct xfs_btree_block *block = XFS_BUF_TO_BLOCK(bp); @@ -910,7 +911,7 @@ xfs_btree_reada_bufs( } STATIC int -xfs_btree_readahead_lblock( +xfs_btree_readahead_fsblock( struct xfs_btree_cur *cur, int lr, struct xfs_btree_block *block) @@ -935,7 +936,7 @@ xfs_btree_readahead_lblock( } STATIC int -xfs_btree_readahead_sblock( +xfs_btree_readahead_agblock( struct xfs_btree_cur *cur, int lr, struct xfs_btree_block *block) @@ -986,8 +987,8 @@ xfs_btree_readahead( block = XFS_BUF_TO_BLOCK(cur->bc_levels[lev].bp); if (cur->bc_ops->ptr_len == XFS_BTREE_LONG_PTR_LEN) - return xfs_btree_readahead_lblock(cur, lr, block); - return xfs_btree_readahead_sblock(cur, lr, block); + return xfs_btree_readahead_fsblock(cur, lr, block); + return xfs_btree_readahead_agblock(cur, lr, block); } STATIC int @@ -4594,7 +4595,7 @@ xfs_btree_change_owner( /* Verify the v5 fields of a long-format btree block. */ xfs_failaddr_t -xfs_btree_lblock_v5hdr_verify( +xfs_btree_fsblock_v5hdr_verify( struct xfs_buf *bp, uint64_t owner) { @@ -4615,7 +4616,7 @@ xfs_btree_lblock_v5hdr_verify( /* Verify a long-format btree block. */ xfs_failaddr_t -xfs_btree_lblock_verify( +xfs_btree_fsblock_verify( struct xfs_buf *bp, unsigned int max_recs) { @@ -4630,21 +4631,22 @@ xfs_btree_lblock_verify( /* sibling pointer verification */ fsb = XFS_DADDR_TO_FSB(mp, xfs_buf_daddr(bp)); - fa = xfs_btree_check_lblock_siblings(mp, fsb, block->bb_u.l.bb_leftsib); + fa = xfs_btree_check_fsblock_siblings(mp, fsb, + block->bb_u.l.bb_leftsib); if (!fa) - fa = xfs_btree_check_lblock_siblings(mp, fsb, + fa = xfs_btree_check_fsblock_siblings(mp, fsb, block->bb_u.l.bb_rightsib); return fa; } /** - * xfs_btree_sblock_v5hdr_verify() -- verify the v5 fields of a short-format + * xfs_btree_agblock_v5hdr_verify() -- verify the v5 fields of a short-format * btree block * * @bp: buffer containing the btree block */ xfs_failaddr_t -xfs_btree_sblock_v5hdr_verify( +xfs_btree_agblock_v5hdr_verify( struct xfs_buf *bp) { struct xfs_mount *mp = bp->b_mount; @@ -4663,13 +4665,13 @@ xfs_btree_sblock_v5hdr_verify( } /** - * xfs_btree_sblock_verify() -- verify a short-format btree block + * xfs_btree_agblock_verify() -- verify a short-format btree block * * @bp: buffer containing the btree block * @max_recs: maximum records allowed in this btree node */ xfs_failaddr_t -xfs_btree_sblock_verify( +xfs_btree_agblock_verify( struct xfs_buf *bp, unsigned int max_recs) { @@ -4684,10 +4686,10 @@ xfs_btree_sblock_verify( /* sibling pointer verification */ agbno = xfs_daddr_to_agbno(mp, xfs_buf_daddr(bp)); - fa = xfs_btree_check_sblock_siblings(bp->b_pag, agbno, + fa = xfs_btree_check_agblock_siblings(bp->b_pag, agbno, block->bb_u.s.bb_leftsib); if (!fa) - fa = xfs_btree_check_sblock_siblings(bp->b_pag, agbno, + fa = xfs_btree_check_agblock_siblings(bp->b_pag, agbno, block->bb_u.s.bb_rightsib); return fa; } diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h index d3afa6209..b9b46a573 100644 --- a/libxfs/xfs_btree.h +++ b/libxfs/xfs_btree.h @@ -441,10 +441,10 @@ int xfs_btree_change_owner(struct xfs_btree_cur *cur, uint64_t new_owner, /* * btree block CRC helpers */ -void xfs_btree_lblock_calc_crc(struct xfs_buf *); -bool xfs_btree_lblock_verify_crc(struct xfs_buf *); -void xfs_btree_sblock_calc_crc(struct xfs_buf *); -bool xfs_btree_sblock_verify_crc(struct xfs_buf *); +void xfs_btree_fsblock_calc_crc(struct xfs_buf *); +bool xfs_btree_fsblock_verify_crc(struct xfs_buf *); +void xfs_btree_agblock_calc_crc(struct xfs_buf *); +bool xfs_btree_agblock_verify_crc(struct xfs_buf *); /* * Internal btree helpers also used by xfs_bmap.c. @@ -484,12 +484,12 @@ static inline int xfs_btree_get_level(const struct xfs_btree_block *block) #define XFS_FILBLKS_MIN(a,b) min_t(xfs_filblks_t, (a), (b)) #define XFS_FILBLKS_MAX(a,b) max_t(xfs_filblks_t, (a), (b)) -xfs_failaddr_t xfs_btree_sblock_v5hdr_verify(struct xfs_buf *bp); -xfs_failaddr_t xfs_btree_sblock_verify(struct xfs_buf *bp, +xfs_failaddr_t xfs_btree_agblock_v5hdr_verify(struct xfs_buf *bp); +xfs_failaddr_t xfs_btree_agblock_verify(struct xfs_buf *bp, unsigned int max_recs); -xfs_failaddr_t xfs_btree_lblock_v5hdr_verify(struct xfs_buf *bp, +xfs_failaddr_t xfs_btree_fsblock_v5hdr_verify(struct xfs_buf *bp, uint64_t owner); -xfs_failaddr_t xfs_btree_lblock_verify(struct xfs_buf *bp, +xfs_failaddr_t xfs_btree_fsblock_verify(struct xfs_buf *bp, unsigned int max_recs); unsigned int xfs_btree_compute_maxlevels(const unsigned int *limits, diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c index cb0a7c779..58c520ecb 100644 --- a/libxfs/xfs_ialloc_btree.c +++ b/libxfs/xfs_ialloc_btree.c @@ -308,7 +308,7 @@ xfs_inobt_verify( * xfs_perag_initialised_agi(pag)) if we ever do. */ if (xfs_has_crc(mp)) { - fa = xfs_btree_sblock_v5hdr_verify(bp); + fa = xfs_btree_agblock_v5hdr_verify(bp); if (fa) return fa; } @@ -318,7 +318,7 @@ xfs_inobt_verify( if (level >= M_IGEO(mp)->inobt_maxlevels) return __this_address; - return xfs_btree_sblock_verify(bp, + return xfs_btree_agblock_verify(bp, M_IGEO(mp)->inobt_mxr[level != 0]); } @@ -328,7 +328,7 @@ xfs_inobt_read_verify( { xfs_failaddr_t fa; - if (!xfs_btree_sblock_verify_crc(bp)) + if (!xfs_btree_agblock_verify_crc(bp)) xfs_verifier_error(bp, -EFSBADCRC, __this_address); else { fa = xfs_inobt_verify(bp); @@ -352,7 +352,7 @@ xfs_inobt_write_verify( xfs_verifier_error(bp, -EFSCORRUPTED, fa); return; } - xfs_btree_sblock_calc_crc(bp); + xfs_btree_agblock_calc_crc(bp); } diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c index 6ec0e36e5..362b2a2d7 100644 --- a/libxfs/xfs_refcount_btree.c +++ b/libxfs/xfs_refcount_btree.c @@ -216,7 +216,7 @@ xfs_refcountbt_verify( if (!xfs_has_reflink(mp)) return __this_address; - fa = xfs_btree_sblock_v5hdr_verify(bp); + fa = xfs_btree_agblock_v5hdr_verify(bp); if (fa) return fa; @@ -238,7 +238,7 @@ xfs_refcountbt_verify( } else if (level >= mp->m_refc_maxlevels) return __this_address; - return xfs_btree_sblock_verify(bp, mp->m_refc_mxr[level != 0]); + return xfs_btree_agblock_verify(bp, mp->m_refc_mxr[level != 0]); } STATIC void @@ -247,7 +247,7 @@ xfs_refcountbt_read_verify( { xfs_failaddr_t fa; - if (!xfs_btree_sblock_verify_crc(bp)) + if (!xfs_btree_agblock_verify_crc(bp)) xfs_verifier_error(bp, -EFSBADCRC, __this_address); else { fa = xfs_refcountbt_verify(bp); @@ -271,7 +271,7 @@ xfs_refcountbt_write_verify( xfs_verifier_error(bp, -EFSCORRUPTED, fa); return; } - xfs_btree_sblock_calc_crc(bp); + xfs_btree_agblock_calc_crc(bp); } diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c index 18168db6e..2b7504f7a 100644 --- a/libxfs/xfs_rmap_btree.c +++ b/libxfs/xfs_rmap_btree.c @@ -334,7 +334,7 @@ xfs_rmapbt_verify( if (!xfs_has_rmapbt(mp)) return __this_address; - fa = xfs_btree_sblock_v5hdr_verify(bp); + fa = xfs_btree_agblock_v5hdr_verify(bp); if (fa) return fa; @@ -345,7 +345,7 @@ xfs_rmapbt_verify( } else if (level >= mp->m_rmap_maxlevels) return __this_address; - return xfs_btree_sblock_verify(bp, mp->m_rmap_mxr[level != 0]); + return xfs_btree_agblock_verify(bp, mp->m_rmap_mxr[level != 0]); } static void @@ -354,7 +354,7 @@ xfs_rmapbt_read_verify( { xfs_failaddr_t fa; - if (!xfs_btree_sblock_verify_crc(bp)) + if (!xfs_btree_agblock_verify_crc(bp)) xfs_verifier_error(bp, -EFSBADCRC, __this_address); else { fa = xfs_rmapbt_verify(bp); @@ -378,7 +378,7 @@ xfs_rmapbt_write_verify( xfs_verifier_error(bp, -EFSCORRUPTED, fa); return; } - xfs_btree_sblock_calc_crc(bp); + xfs_btree_agblock_calc_crc(bp); }

[083/111] xfs: rename btree helpers that depends on the block number representation

Commit Message

Patch