[074/110] xfs: remove xfs_btnum_t

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

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c index 599271e5c22e..0eefb16cc47e 100644 --- a/libxfs/xfs_alloc.c +++ b/libxfs/xfs_alloc.c @@ -914,7 +914,7 @@ xfs_alloc_cur_check( bool busy; unsigned busy_gen = 0; bool deactivate = false; - bool isbnobt = cur->bc_btnum == XFS_BTNUM_BNO; + bool isbnobt = xfs_btree_is_bno(cur->bc_ops); *new = 0; @@ -4022,7 +4022,7 @@ xfs_alloc_query_range( union xfs_btree_irec high_brec = { .a = *high_rec }; struct xfs_alloc_query_range_info query = { .priv = priv, .fn = fn }; - ASSERT(cur->bc_btnum == XFS_BTNUM_BNO); + ASSERT(xfs_btree_is_bno(cur->bc_ops)); return xfs_btree_query_range(cur, &low_brec, &high_brec, xfs_alloc_query_range_helper, &query); } @@ -4036,7 +4036,7 @@ xfs_alloc_query_all( { struct xfs_alloc_query_range_info query; - ASSERT(cur->bc_btnum == XFS_BTNUM_BNO); + ASSERT(xfs_btree_is_bno(cur->bc_ops)); query.priv = priv; query.fn = fn; return xfs_btree_query_all(cur, xfs_alloc_query_range_helper, &query); diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c index b219dc6ac136..35d3dde426b1 100644 --- a/libxfs/xfs_alloc_btree.c +++ b/libxfs/xfs_alloc_btree.c @@ -49,7 +49,7 @@ xfs_allocbt_set_root( ASSERT(ptr->s != 0); - if (cur->bc_btnum == XFS_BTNUM_BNO) { + if (xfs_btree_is_bno(cur->bc_ops)) { agf->agf_bno_root = ptr->s; be32_add_cpu(&agf->agf_bno_level, inc); cur->bc_ag.pag->pagf_bno_level += inc; @@ -129,7 +129,7 @@ xfs_allocbt_update_lastrec( __be32 len; int numrecs; - ASSERT(cur->bc_btnum == XFS_BTNUM_CNT); + ASSERT(!xfs_btree_is_bno(cur->bc_ops)); switch (reason) { case LASTREC_UPDATE: @@ -239,7 +239,7 @@ xfs_allocbt_init_ptr_from_cur( ASSERT(cur->bc_ag.pag->pag_agno == be32_to_cpu(agf->agf_seqno)); - if (cur->bc_btnum == XFS_BTNUM_BNO) + if (xfs_btree_is_bno(cur->bc_ops)) ptr->s = agf->agf_bno_root; else ptr->s = agf->agf_cnt_root; @@ -552,7 +552,7 @@ xfs_bnobt_init_cursor( { struct xfs_btree_cur *cur; - cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_BNO, &xfs_bnobt_ops, + cur = xfs_btree_alloc_cursor(mp, tp, &xfs_bnobt_ops, mp->m_alloc_maxlevels, xfs_allocbt_cur_cache); cur->bc_ag.pag = xfs_perag_hold(pag); cur->bc_ag.agbp = agbp; @@ -578,7 +578,7 @@ xfs_cntbt_init_cursor( { struct xfs_btree_cur *cur; - cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_CNT, &xfs_cntbt_ops, + cur = xfs_btree_alloc_cursor(mp, tp, &xfs_cntbt_ops, mp->m_alloc_maxlevels, xfs_allocbt_cur_cache); cur->bc_ag.pag = xfs_perag_hold(pag); cur->bc_ag.agbp = agbp; @@ -605,7 +605,7 @@ xfs_allocbt_commit_staged_btree( ASSERT(cur->bc_flags & XFS_BTREE_STAGING); - if (cur->bc_btnum == XFS_BTNUM_BNO) { + if (xfs_btree_is_bno(cur->bc_ops)) { agf->agf_bno_root = cpu_to_be32(afake->af_root); agf->agf_bno_level = cpu_to_be32(afake->af_levels); } else { diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c index 12b94c74ecb1..eede6ffd62ea 100644 --- a/libxfs/xfs_bmap_btree.c +++ b/libxfs/xfs_bmap_btree.c @@ -573,8 +573,8 @@ xfs_bmbt_init_cursor( maxlevels = mp->m_bm_maxlevels[whichfork]; break; } - cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_BMAP, &xfs_bmbt_ops, - maxlevels, xfs_bmbt_cur_cache); + cur = xfs_btree_alloc_cursor(mp, tp, &xfs_bmbt_ops, maxlevels, + xfs_bmbt_cur_cache); cur->bc_ino.ip = ip; cur->bc_ino.whichfork = whichfork; cur->bc_bmap.allocated = 0; diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c index 95f77fbe7111..0b6d8d6f1de3 100644 --- a/libxfs/xfs_btree.c +++ b/libxfs/xfs_btree.c @@ -451,7 +451,7 @@ xfs_btree_del_cursor( * zero, then we should be shut down or on our way to shutdown due to * cancelling a dirty transaction on error. */ - ASSERT(cur->bc_btnum != XFS_BTNUM_BMAP || cur->bc_bmap.allocated == 0 || + ASSERT(!xfs_btree_is_bmap(cur->bc_ops) || cur->bc_bmap.allocated == 0 || xfs_is_shutdown(cur->bc_mp) || error != 0); switch (cur->bc_ops->type) { @@ -3013,7 +3013,7 @@ xfs_btree_split( struct xfs_btree_split_args args; DECLARE_COMPLETION_ONSTACK(done); - if (cur->bc_btnum != XFS_BTNUM_BMAP || + if (!xfs_btree_is_bmap(cur->bc_ops) || cur->bc_tp->t_highest_agno == NULLAGNUMBER) return __xfs_btree_split(cur, level, ptrp, key, curp, stat); diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h index 6e5fd0c06453..9a264ffee303 100644 --- a/libxfs/xfs_btree.h +++ b/libxfs/xfs_btree.h @@ -55,14 +55,6 @@ union xfs_btree_rec { #define XFS_LOOKUP_LE ((xfs_lookup_t)XFS_LOOKUP_LEi) #define XFS_LOOKUP_GE ((xfs_lookup_t)XFS_LOOKUP_GEi) -#define XFS_BTNUM_BNO ((xfs_btnum_t)XFS_BTNUM_BNOi) -#define XFS_BTNUM_CNT ((xfs_btnum_t)XFS_BTNUM_CNTi) -#define XFS_BTNUM_BMAP ((xfs_btnum_t)XFS_BTNUM_BMAPi) -#define XFS_BTNUM_INO ((xfs_btnum_t)XFS_BTNUM_INOi) -#define XFS_BTNUM_FINO ((xfs_btnum_t)XFS_BTNUM_FINOi) -#define XFS_BTNUM_RMAP ((xfs_btnum_t)XFS_BTNUM_RMAPi) -#define XFS_BTNUM_REFC ((xfs_btnum_t)XFS_BTNUM_REFCi) - struct xfs_btree_ops; uint32_t xfs_btree_magic(struct xfs_mount *mp, const struct xfs_btree_ops *ops); @@ -272,7 +264,6 @@ struct xfs_btree_cur const struct xfs_btree_ops *bc_ops; struct kmem_cache *bc_cache; /* cursor cache */ unsigned int bc_flags; /* btree features - below */ - xfs_btnum_t bc_btnum; /* identifies which btree type */ union xfs_btree_irec bc_rec; /* current insert/search record value */ uint8_t bc_nlevels; /* number of levels in the tree */ uint8_t bc_maxlevels; /* maximum levels for this btree type */ @@ -726,7 +717,6 @@ static inline struct xfs_btree_cur * xfs_btree_alloc_cursor( struct xfs_mount *mp, struct xfs_trans *tp, - xfs_btnum_t btnum, const struct xfs_btree_ops *ops, uint8_t maxlevels, struct kmem_cache *cache) @@ -742,7 +732,6 @@ xfs_btree_alloc_cursor( cur->bc_ops = ops; cur->bc_tp = tp; cur->bc_mp = mp; - cur->bc_btnum = btnum; cur->bc_maxlevels = maxlevels; cur->bc_cache = cache; diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c index 296548bc1d45..c30e76830bb1 100644 --- a/libxfs/xfs_ialloc.c +++ b/libxfs/xfs_ialloc.c @@ -2843,7 +2843,7 @@ xfs_ialloc_count_inodes( struct xfs_ialloc_count_inodes ci = {0}; int error; - ASSERT(cur->bc_btnum == XFS_BTNUM_INO); + ASSERT(xfs_btree_is_ino(cur->bc_ops)); error = xfs_btree_query_all(cur, xfs_ialloc_count_inodes_rec, &ci); if (error) return error; diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c index 2f095862e153..cb0a7c7792a1 100644 --- a/libxfs/xfs_ialloc_btree.c +++ b/libxfs/xfs_ialloc_btree.c @@ -89,9 +89,9 @@ xfs_inobt_mod_blockcount( if (!xfs_has_inobtcounts(cur->bc_mp)) return; - if (cur->bc_btnum == XFS_BTNUM_FINO) + if (xfs_btree_is_fino(cur->bc_ops)) be32_add_cpu(&agi->agi_fblocks, howmuch); - else if (cur->bc_btnum == XFS_BTNUM_INO) + else be32_add_cpu(&agi->agi_iblocks, howmuch); xfs_ialloc_log_agi(cur->bc_tp, agbp, XFS_AGI_IBLOCKS); } @@ -480,7 +480,7 @@ xfs_inobt_init_cursor( struct xfs_mount *mp = pag->pag_mount; struct xfs_btree_cur *cur; - cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_INO, &xfs_inobt_ops, + cur = xfs_btree_alloc_cursor(mp, tp, &xfs_inobt_ops, M_IGEO(mp)->inobt_maxlevels, xfs_inobt_cur_cache); cur->bc_ag.pag = xfs_perag_hold(pag); cur->bc_ag.agbp = agbp; @@ -506,7 +506,7 @@ xfs_finobt_init_cursor( struct xfs_mount *mp = pag->pag_mount; struct xfs_btree_cur *cur; - cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_FINO, &xfs_finobt_ops, + cur = xfs_btree_alloc_cursor(mp, tp, &xfs_finobt_ops, M_IGEO(mp)->inobt_maxlevels, xfs_inobt_cur_cache); cur->bc_ag.pag = xfs_perag_hold(pag); cur->bc_ag.agbp = agbp; @@ -534,7 +534,7 @@ xfs_inobt_commit_staged_btree( ASSERT(cur->bc_flags & XFS_BTREE_STAGING); - if (cur->bc_btnum == XFS_BTNUM_INO) { + if (xfs_btree_is_ino(cur->bc_ops)) { fields = XFS_AGI_ROOT | XFS_AGI_LEVEL; agi->agi_root = cpu_to_be32(afake->af_root); agi->agi_level = cpu_to_be32(afake->af_levels); diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c index 31ef879badb8..6ec0e36e5819 100644 --- a/libxfs/xfs_refcount_btree.c +++ b/libxfs/xfs_refcount_btree.c @@ -363,9 +363,8 @@ xfs_refcountbt_init_cursor( ASSERT(pag->pag_agno < mp->m_sb.sb_agcount); - cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_REFC, - &xfs_refcountbt_ops, mp->m_refc_maxlevels, - xfs_refcountbt_cur_cache); + cur = xfs_btree_alloc_cursor(mp, tp, &xfs_refcountbt_ops, + mp->m_refc_maxlevels, xfs_refcountbt_cur_cache); cur->bc_ag.pag = xfs_perag_hold(pag); cur->bc_refc.nr_ops = 0; cur->bc_refc.shape_changes = 0; diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c index c7ca2004354b..18168db6ed0e 100644 --- a/libxfs/xfs_rmap_btree.c +++ b/libxfs/xfs_rmap_btree.c @@ -516,7 +516,7 @@ xfs_rmapbt_init_cursor( { struct xfs_btree_cur *cur; - cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_RMAP, &xfs_rmapbt_ops, + cur = xfs_btree_alloc_cursor(mp, tp, &xfs_rmapbt_ops, mp->m_rmap_maxlevels, xfs_rmapbt_cur_cache); cur->bc_ag.pag = xfs_perag_hold(pag); cur->bc_ag.agbp = agbp; diff --git a/libxfs/xfs_shared.h b/libxfs/xfs_shared.h index 518ea9456eba..6b8bc276d461 100644 --- a/libxfs/xfs_shared.h +++ b/libxfs/xfs_shared.h @@ -52,6 +52,41 @@ extern const struct xfs_btree_ops xfs_bmbt_ops; extern const struct xfs_btree_ops xfs_refcountbt_ops; extern const struct xfs_btree_ops xfs_rmapbt_ops; +static inline bool xfs_btree_is_bno(const struct xfs_btree_ops *ops) +{ + return ops == &xfs_bnobt_ops; +} + +static inline bool xfs_btree_is_cnt(const struct xfs_btree_ops *ops) +{ + return ops == &xfs_cntbt_ops; +} + +static inline bool xfs_btree_is_bmap(const struct xfs_btree_ops *ops) +{ + return ops == &xfs_bmbt_ops; +} + +static inline bool xfs_btree_is_ino(const struct xfs_btree_ops *ops) +{ + return ops == &xfs_inobt_ops; +} + +static inline bool xfs_btree_is_fino(const struct xfs_btree_ops *ops) +{ + return ops == &xfs_finobt_ops; +} + +static inline bool xfs_btree_is_refcount(const struct xfs_btree_ops *ops) +{ + return ops == &xfs_refcountbt_ops; +} + +static inline bool xfs_btree_is_rmap(const struct xfs_btree_ops *ops) +{ + return ops == &xfs_rmapbt_ops; +} + /* log size calculation functions */ int xfs_log_calc_unit_res(struct xfs_mount *mp, int unit_bytes); int xfs_log_calc_minimum_size(struct xfs_mount *); diff --git a/libxfs/xfs_types.h b/libxfs/xfs_types.h index f577247b748d..76eb9e328835 100644 --- a/libxfs/xfs_types.h +++ b/libxfs/xfs_types.h @@ -116,15 +116,6 @@ typedef enum { { XFS_LOOKUP_LEi, "le" }, \ { XFS_LOOKUP_GEi, "ge" } -/* - * This enum is used in string mapping in xfs_trace.h and scrub/trace.h; - * please keep the TRACE_DEFINE_ENUMs for it up to date. - */ -typedef enum { - XFS_BTNUM_BNOi, XFS_BTNUM_CNTi, XFS_BTNUM_RMAPi, XFS_BTNUM_BMAPi, - XFS_BTNUM_INOi, XFS_BTNUM_FINOi, XFS_BTNUM_REFCi, XFS_BTNUM_MAX -} xfs_btnum_t; - struct xfs_name { const unsigned char *name; int len; diff --git a/repair/agbtree.c b/repair/agbtree.c index 7d772715113e..1a3e40cca68c 100644 --- a/repair/agbtree.c +++ b/repair/agbtree.c @@ -204,7 +204,7 @@ get_bno_rec( { xfs_agnumber_t agno = cur->bc_ag.pag->pag_agno; - if (cur->bc_btnum == XFS_BTNUM_BNO) { + if (xfs_btree_is_bno(cur->bc_ops)) { if (!prev_value) return findfirst_bno_extent(agno); return findnext_bno_extent(prev_value); @@ -378,7 +378,7 @@ get_ino_rec( { xfs_agnumber_t agno = cur->bc_ag.pag->pag_agno; - if (cur->bc_btnum == XFS_BTNUM_INO) { + if (xfs_btree_is_ino(cur->bc_ops)) { if (!prev_value) return findfirst_inode_rec(agno); return next_ino_rec(prev_value); diff --git a/repair/phase5.c b/repair/phase5.c index 6ae2ea575582..b689a4234143 100644 --- a/repair/phase5.c +++ b/repair/phase5.c @@ -304,11 +304,9 @@ build_agf_agfl( } #ifdef XR_BLD_FREE_TRACE - fprintf(stderr, "bno root = %u, bcnt root = %u, indices = %u %u\n", + fprintf(stderr, "bno root = %u, bcnt root = %u\n", be32_to_cpu(agf->agf_bno_root), - be32_to_cpu(agf->agf_cnt_root), - XFS_BTNUM_BNO, - XFS_BTNUM_CNT); + be32_to_cpu(agf->agf_cnt_root)); #endif if (xfs_has_crc(mp))

[074/110] xfs: remove xfs_btnum_t

Commit Message

Patch