[065/111] xfs: split the agf_roots and agf_levels arrays

Message ID	171634532672.2478931.2282082348214647954.stgit@frogsfrogsfrogs (mailing list archive)
State	Superseded, 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 715454C89 for <linux-xfs@vger.kernel.org>; Wed, 22 May 2024 03:05:44 +0000 (UTC) Date: Tue, 21 May 2024 20:05:43 -0700 Subject: [PATCH 065/111] xfs: split the agf_roots and agf_levels arrays From: "Darrick J. Wong" <djwong@kernel.org> To: djwong@kernel.org, cem@kernel.org Cc: Christoph Hellwig <hch@lst.de>, linux-xfs@vger.kernel.org Message-ID: <171634532672.2478931.2282082348214647954.stgit@frogsfrogsfrogs> In-Reply-To: <171634531590.2478931.8474978645585392776.stgit@frogsfrogsfrogs> References: <171634531590.2478931.8474978645585392776.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/copy/xfs_copy.c b/copy/xfs_copy.c index 98a578a01..07957e007 100644 --- a/copy/xfs_copy.c +++ b/copy/xfs_copy.c @@ -1016,10 +1016,10 @@ main(int argc, char **argv) /* traverse btree until we get to the leftmost leaf node */ - bno = be32_to_cpu(ag_hdr.xfs_agf->agf_roots[XFS_BTNUM_BNOi]); + bno = be32_to_cpu(ag_hdr.xfs_agf->agf_bno_root); current_level = 0; btree_levels = be32_to_cpu(ag_hdr.xfs_agf-> - agf_levels[XFS_BTNUM_BNOi]); + agf_bno_level); ag_end = XFS_AGB_TO_DADDR(mp, agno, be32_to_cpu(ag_hdr.xfs_agf->agf_length) - 1) diff --git a/db/agf.c b/db/agf.c index 8a6e2824d..5d465f5d2 100644 --- a/db/agf.c +++ b/db/agf.c @@ -35,31 +35,15 @@ const field_t agf_flds[] = { { "versionnum", FLDT_UINT32D, OI(OFF(versionnum)), C1, 0, TYP_NONE }, { "seqno", FLDT_AGNUMBER, OI(OFF(seqno)), C1, 0, TYP_NONE }, { "length", FLDT_AGBLOCK, OI(OFF(length)), C1, 0, TYP_NONE }, - { "roots", FLDT_AGBLOCK, OI(OFF(roots)), CI(XFS_BTNUM_AGF), - FLD_ARRAY|FLD_SKIPALL, TYP_NONE }, - { "bnoroot", FLDT_AGBLOCK, - OI(OFF(roots) + XFS_BTNUM_BNO * SZ(roots[XFS_BTNUM_BNO])), C1, 0, - TYP_BNOBT }, - { "cntroot", FLDT_AGBLOCK, - OI(OFF(roots) + XFS_BTNUM_CNT * SZ(roots[XFS_BTNUM_CNT])), C1, 0, - TYP_CNTBT }, - { "rmaproot", FLDT_AGBLOCKNZ, - OI(OFF(roots) + XFS_BTNUM_RMAP * SZ(roots[XFS_BTNUM_RMAP])), C1, 0, - TYP_RMAPBT }, + { "bnoroot", FLDT_AGBLOCK, OI(OFF(bno_root)), C1, 0, TYP_BNOBT }, + { "cntroot", FLDT_AGBLOCK, OI(OFF(cnt_root)), C1, 0, TYP_CNTBT }, + { "rmaproot", FLDT_AGBLOCKNZ, OI(OFF(rmap_root)), C1, 0, TYP_RMAPBT }, { "refcntroot", FLDT_AGBLOCKNZ, OI(OFF(refcount_root)), C1, 0, TYP_REFCBT }, - { "levels", FLDT_UINT32D, OI(OFF(levels)), CI(XFS_BTNUM_AGF), - FLD_ARRAY|FLD_SKIPALL, TYP_NONE }, - { "bnolevel", FLDT_UINT32D, - OI(OFF(levels) + XFS_BTNUM_BNO * SZ(levels[XFS_BTNUM_BNO])), C1, 0, - TYP_NONE }, - { "cntlevel", FLDT_UINT32D, - OI(OFF(levels) + XFS_BTNUM_CNT * SZ(levels[XFS_BTNUM_CNT])), C1, 0, - TYP_NONE }, - { "rmaplevel", FLDT_UINT32D, - OI(OFF(levels) + XFS_BTNUM_RMAP * SZ(levels[XFS_BTNUM_RMAP])), C1, 0, - TYP_NONE }, + { "bnolevel", FLDT_UINT32D, OI(OFF(bno_level)), C1, 0, TYP_NONE }, + { "cntlevel", FLDT_UINT32D, OI(OFF(cnt_level)), C1, 0, TYP_NONE }, + { "rmaplevel", FLDT_UINT32D, OI(OFF(rmap_level)), C1, 0, TYP_NONE }, { "refcntlevel", FLDT_UINT32D, OI(OFF(refcount_level)), C1, 0, TYP_NONE }, diff --git a/db/check.c b/db/check.c index 0a53ab7df..bceaf318d 100644 --- a/db/check.c +++ b/db/check.c @@ -4095,18 +4095,18 @@ scan_ag( scan_freelist(agf); fdblocks--; scan_sbtree(agf, - be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]), - be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]), + be32_to_cpu(agf->agf_bno_root), + be32_to_cpu(agf->agf_bno_level), 1, scanfunc_bno, TYP_BNOBT); fdblocks--; scan_sbtree(agf, - be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]), - be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]), + be32_to_cpu(agf->agf_cnt_root), + be32_to_cpu(agf->agf_cnt_level), 1, scanfunc_cnt, TYP_CNTBT); - if (agf->agf_roots[XFS_BTNUM_RMAP]) { + if (agf->agf_rmap_root) { scan_sbtree(agf, - be32_to_cpu(agf->agf_roots[XFS_BTNUM_RMAP]), - be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]), + be32_to_cpu(agf->agf_rmap_root), + be32_to_cpu(agf->agf_rmap_level), 1, scanfunc_rmap, TYP_RMAPBT); } if (agf->agf_refcount_root) { diff --git a/db/freesp.c b/db/freesp.c index 6f2346665..883741e66 100644 --- a/db/freesp.c +++ b/db/freesp.c @@ -209,12 +209,12 @@ scan_ag( agf = iocur_top->data; scan_freelist(agf); if (countflag) - scan_sbtree(agf, be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]), - TYP_CNTBT, be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]), + scan_sbtree(agf, be32_to_cpu(agf->agf_cnt_root), + TYP_CNTBT, be32_to_cpu(agf->agf_cnt_level), scanfunc_cnt); else - scan_sbtree(agf, be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]), - TYP_BNOBT, be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]), + scan_sbtree(agf, be32_to_cpu(agf->agf_bno_root), + TYP_BNOBT, be32_to_cpu(agf->agf_bno_level), scanfunc_bno); pop_cur(); } diff --git a/db/metadump.c b/db/metadump.c index 536d089fb..a656ef574 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -460,8 +460,8 @@ copy_free_bno_btree( xfs_agblock_t root; int levels; - root = be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]); - levels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]); + root = be32_to_cpu(agf->agf_bno_root); + levels = be32_to_cpu(agf->agf_bno_level); /* validate root and levels before processing the tree */ if (root == 0 || root > mp->m_sb.sb_agblocks) { @@ -488,8 +488,8 @@ copy_free_cnt_btree( xfs_agblock_t root; int levels; - root = be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]); - levels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]); + root = be32_to_cpu(agf->agf_cnt_root); + levels = be32_to_cpu(agf->agf_cnt_level); /* validate root and levels before processing the tree */ if (root == 0 || root > mp->m_sb.sb_agblocks) { @@ -560,8 +560,8 @@ copy_rmap_btree( if (!xfs_has_rmapbt(mp)) return 1; - root = be32_to_cpu(agf->agf_roots[XFS_BTNUM_RMAP]); - levels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]); + root = be32_to_cpu(agf->agf_rmap_root); + levels = be32_to_cpu(agf->agf_rmap_level); /* validate root and levels before processing the tree */ if (root == 0 || root > mp->m_sb.sb_agblocks) { diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c index cdca7f247..389a8288e 100644 --- a/libxfs/xfs_ag.c +++ b/libxfs/xfs_ag.c @@ -667,14 +667,13 @@ xfs_agfblock_init( agf->agf_versionnum = cpu_to_be32(XFS_AGF_VERSION); agf->agf_seqno = cpu_to_be32(id->agno); agf->agf_length = cpu_to_be32(id->agsize); - agf->agf_roots[XFS_BTNUM_BNOi] = cpu_to_be32(XFS_BNO_BLOCK(mp)); - agf->agf_roots[XFS_BTNUM_CNTi] = cpu_to_be32(XFS_CNT_BLOCK(mp)); - agf->agf_levels[XFS_BTNUM_BNOi] = cpu_to_be32(1); - agf->agf_levels[XFS_BTNUM_CNTi] = cpu_to_be32(1); + agf->agf_bno_root = cpu_to_be32(XFS_BNO_BLOCK(mp)); + agf->agf_cnt_root = cpu_to_be32(XFS_CNT_BLOCK(mp)); + agf->agf_bno_level = cpu_to_be32(1); + agf->agf_cnt_level = cpu_to_be32(1); if (xfs_has_rmapbt(mp)) { - agf->agf_roots[XFS_BTNUM_RMAPi] = - cpu_to_be32(XFS_RMAP_BLOCK(mp)); - agf->agf_levels[XFS_BTNUM_RMAPi] = cpu_to_be32(1); + agf->agf_rmap_root = cpu_to_be32(XFS_RMAP_BLOCK(mp)); + agf->agf_rmap_level = cpu_to_be32(1); agf->agf_rmap_blocks = cpu_to_be32(1); } diff --git a/libxfs/xfs_ag.h b/libxfs/xfs_ag.h index 77c0fa2bb..19eddba09 100644 --- a/libxfs/xfs_ag.h +++ b/libxfs/xfs_ag.h @@ -36,8 +36,9 @@ struct xfs_perag { atomic_t pag_active_ref; /* active reference count */ wait_queue_head_t pag_active_wq;/* woken active_ref falls to zero */ unsigned long pag_opstate; - uint8_t pagf_levels[XFS_BTNUM_AGF]; - /* # of levels in bno & cnt btree */ + uint8_t pagf_bno_level; /* # of levels in bno btree */ + uint8_t pagf_cnt_level; /* # of levels in cnt btree */ + uint8_t pagf_rmap_level;/* # of levels in rmap btree */ uint32_t pagf_flcount; /* count of blocks in freelist */ xfs_extlen_t pagf_freeblks; /* total free blocks */ xfs_extlen_t pagf_longest; /* longest free space */ @@ -86,7 +87,8 @@ struct xfs_perag { * Alternate btree heights so that online repair won't trip the write * verifiers while rebuilding the AG btrees. */ - uint8_t pagf_repair_levels[XFS_BTNUM_AGF]; + uint8_t pagf_repair_bno_level; + uint8_t pagf_repair_cnt_level; uint8_t pagf_repair_refcount_level; #endif diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c index e5ae53948..1fdd7d44c 100644 --- a/libxfs/xfs_alloc.c +++ b/libxfs/xfs_alloc.c @@ -2331,8 +2331,9 @@ xfs_alloc_min_freelist( struct xfs_perag *pag) { /* AG btrees have at least 1 level. */ - static const uint8_t fake_levels[XFS_BTNUM_AGF] = {1, 1, 1}; - const uint8_t *levels = pag ? pag->pagf_levels : fake_levels; + const unsigned int bno_level = pag ? pag->pagf_bno_level : 1; + const unsigned int cnt_level = pag ? pag->pagf_cnt_level : 1; + const unsigned int rmap_level = pag ? pag->pagf_rmap_level : 1; unsigned int min_free; ASSERT(mp->m_alloc_maxlevels > 0); @@ -2359,16 +2360,12 @@ xfs_alloc_min_freelist( */ /* space needed by-bno freespace btree */ - min_free = min_t(unsigned int, levels[XFS_BTNUM_BNOi] + 1, - mp->m_alloc_maxlevels) * 2 - 2; + min_free = min(bno_level + 1, mp->m_alloc_maxlevels) * 2 - 2; /* space needed by-size freespace btree */ - min_free += min_t(unsigned int, levels[XFS_BTNUM_CNTi] + 1, - mp->m_alloc_maxlevels) * 2 - 2; + min_free += min(cnt_level + 1, mp->m_alloc_maxlevels) * 2 - 2; /* space needed reverse mapping used space btree */ if (xfs_has_rmapbt(mp)) - min_free += min_t(unsigned int, levels[XFS_BTNUM_RMAPi] + 1, - mp->m_rmap_maxlevels) * 2 - 2; - + min_free += min(rmap_level + 1, mp->m_rmap_maxlevels) * 2 - 2; return min_free; } @@ -3052,8 +3049,8 @@ xfs_alloc_log_agf( offsetof(xfs_agf_t, agf_versionnum), offsetof(xfs_agf_t, agf_seqno), offsetof(xfs_agf_t, agf_length), - offsetof(xfs_agf_t, agf_roots[0]), - offsetof(xfs_agf_t, agf_levels[0]), + offsetof(xfs_agf_t, agf_bno_root), /* also cnt/rmap root */ + offsetof(xfs_agf_t, agf_bno_level), /* also cnt/rmap levels */ offsetof(xfs_agf_t, agf_flfirst), offsetof(xfs_agf_t, agf_fllast), offsetof(xfs_agf_t, agf_flcount), @@ -3232,12 +3229,10 @@ xfs_agf_verify( be32_to_cpu(agf->agf_freeblks) > agf_length) return __this_address; - if (be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) < 1 || - be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) < 1 || - be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) > - mp->m_alloc_maxlevels || - be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) > - mp->m_alloc_maxlevels) + if (be32_to_cpu(agf->agf_bno_level) < 1 || + be32_to_cpu(agf->agf_cnt_level) < 1 || + be32_to_cpu(agf->agf_bno_level) > mp->m_alloc_maxlevels || + be32_to_cpu(agf->agf_cnt_level) > mp->m_alloc_maxlevels) return __this_address; if (xfs_has_lazysbcount(mp) && @@ -3248,9 +3243,8 @@ xfs_agf_verify( if (be32_to_cpu(agf->agf_rmap_blocks) > agf_length) return __this_address; - if (be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) < 1 || - be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) > - mp->m_rmap_maxlevels) + if (be32_to_cpu(agf->agf_rmap_level) < 1 || + be32_to_cpu(agf->agf_rmap_level) > mp->m_rmap_maxlevels) return __this_address; } @@ -3376,12 +3370,9 @@ xfs_alloc_read_agf( pag->pagf_btreeblks = be32_to_cpu(agf->agf_btreeblks); pag->pagf_flcount = be32_to_cpu(agf->agf_flcount); pag->pagf_longest = be32_to_cpu(agf->agf_longest); - pag->pagf_levels[XFS_BTNUM_BNOi] = - be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNOi]); - pag->pagf_levels[XFS_BTNUM_CNTi] = - be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi]); - pag->pagf_levels[XFS_BTNUM_RMAPi] = - be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAPi]); + pag->pagf_bno_level = be32_to_cpu(agf->agf_bno_level); + pag->pagf_cnt_level = be32_to_cpu(agf->agf_cnt_level); + pag->pagf_rmap_level = be32_to_cpu(agf->agf_rmap_level); pag->pagf_refcount_level = be32_to_cpu(agf->agf_refcount_level); if (xfs_agfl_needs_reset(pag->pag_mount, agf)) set_bit(XFS_AGSTATE_AGFL_NEEDS_RESET, &pag->pag_opstate); @@ -3410,10 +3401,8 @@ xfs_alloc_read_agf( ASSERT(pag->pagf_btreeblks == be32_to_cpu(agf->agf_btreeblks)); ASSERT(pag->pagf_flcount == be32_to_cpu(agf->agf_flcount)); ASSERT(pag->pagf_longest == be32_to_cpu(agf->agf_longest)); - ASSERT(pag->pagf_levels[XFS_BTNUM_BNOi] == - be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNOi])); - ASSERT(pag->pagf_levels[XFS_BTNUM_CNTi] == - be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi])); + ASSERT(pag->pagf_bno_level == be32_to_cpu(agf->agf_bno_level)); + ASSERT(pag->pagf_cnt_level == be32_to_cpu(agf->agf_cnt_level)); } #endif if (agfbpp) diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c index bd7878b68..dd9584269 100644 --- a/libxfs/xfs_alloc_btree.c +++ b/libxfs/xfs_alloc_btree.c @@ -36,13 +36,18 @@ xfs_allocbt_set_root( { struct xfs_buf *agbp = cur->bc_ag.agbp; struct xfs_agf *agf = agbp->b_addr; - int btnum = cur->bc_btnum; ASSERT(ptr->s != 0); - agf->agf_roots[btnum] = ptr->s; - be32_add_cpu(&agf->agf_levels[btnum], inc); - cur->bc_ag.pag->pagf_levels[btnum] += inc; + if (cur->bc_btnum == XFS_BTNUM_BNO) { + agf->agf_bno_root = ptr->s; + be32_add_cpu(&agf->agf_bno_level, inc); + cur->bc_ag.pag->pagf_bno_level += inc; + } else { + agf->agf_cnt_root = ptr->s; + be32_add_cpu(&agf->agf_cnt_level, inc); + cur->bc_ag.pag->pagf_cnt_level += inc; + } xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS); } @@ -224,7 +229,10 @@ xfs_allocbt_init_ptr_from_cur( ASSERT(cur->bc_ag.pag->pag_agno == be32_to_cpu(agf->agf_seqno)); - ptr->s = agf->agf_roots[cur->bc_btnum]; + if (cur->bc_btnum == XFS_BTNUM_BNO) + ptr->s = agf->agf_bno_root; + else + ptr->s = agf->agf_cnt_root; } STATIC int64_t @@ -297,7 +305,6 @@ xfs_allocbt_verify( struct xfs_perag *pag = bp->b_pag; xfs_failaddr_t fa; unsigned int level; - xfs_btnum_t btnum = XFS_BTNUM_BNOi; if (!xfs_verify_magic(bp, block->bb_magic)) return __this_address; @@ -318,21 +325,27 @@ xfs_allocbt_verify( * against. */ level = be16_to_cpu(block->bb_level); - if (bp->b_ops->magic[0] == cpu_to_be32(XFS_ABTC_MAGIC)) - btnum = XFS_BTNUM_CNTi; if (pag && xfs_perag_initialised_agf(pag)) { - unsigned int maxlevel = pag->pagf_levels[btnum]; + unsigned int maxlevel, repair_maxlevel = 0; -#ifdef CONFIG_XFS_ONLINE_REPAIR /* * Online repair could be rewriting the free space btrees, so * we'll validate against the larger of either tree while this * is going on. */ - maxlevel = max_t(unsigned int, maxlevel, - pag->pagf_repair_levels[btnum]); + if (bp->b_ops->magic[0] == cpu_to_be32(XFS_ABTC_MAGIC)) { + maxlevel = pag->pagf_cnt_level; +#ifdef CONFIG_XFS_ONLINE_REPAIR + repair_maxlevel = pag->pagf_repair_cnt_level; #endif - if (level >= maxlevel) + } else { + maxlevel = pag->pagf_bno_level; +#ifdef CONFIG_XFS_ONLINE_REPAIR + repair_maxlevel = pag->pagf_repair_bno_level; +#endif + } + + if (level >= max(maxlevel, repair_maxlevel)) return __this_address; } else if (level >= mp->m_alloc_maxlevels) return __this_address; @@ -540,8 +553,8 @@ xfs_allocbt_init_cursor( struct xfs_agf *agf = agbp->b_addr; cur->bc_nlevels = (btnum == XFS_BTNUM_BNO) ? - be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]) : - be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]); + be32_to_cpu(agf->agf_bno_level) : + be32_to_cpu(agf->agf_cnt_level); } return cur; } @@ -561,8 +574,13 @@ xfs_allocbt_commit_staged_btree( ASSERT(cur->bc_flags & XFS_BTREE_STAGING); - agf->agf_roots[cur->bc_btnum] = cpu_to_be32(afake->af_root); - agf->agf_levels[cur->bc_btnum] = cpu_to_be32(afake->af_levels); + if (cur->bc_btnum == XFS_BTNUM_BNO) { + agf->agf_bno_root = cpu_to_be32(afake->af_root); + agf->agf_bno_level = cpu_to_be32(afake->af_levels); + } else { + agf->agf_cnt_root = cpu_to_be32(afake->af_root); + agf->agf_cnt_level = cpu_to_be32(afake->af_levels); + } xfs_alloc_log_agf(tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS); xfs_btree_commit_afakeroot(cur, tp, agbp); diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h index 382ab1e71..2b2f9050f 100644 --- a/libxfs/xfs_format.h +++ b/libxfs/xfs_format.h @@ -477,15 +477,9 @@ xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino) #define XFS_AGI_GOOD_VERSION(v) ((v) == XFS_AGI_VERSION) /* - * Btree number 0 is bno, 1 is cnt, 2 is rmap. This value gives the size of the - * arrays below. - */ -#define XFS_BTNUM_AGF ((int)XFS_BTNUM_RMAPi + 1) - -/* - * The second word of agf_levels in the first a.g. overlaps the EFS - * superblock's magic number. Since the magic numbers valid for EFS - * are > 64k, our value cannot be confused for an EFS superblock's. + * agf_cnt_level in the first AGF overlaps the EFS superblock's magic number. + * Since the magic numbers valid for EFS are > 64k, our value cannot be confused + * for an EFS superblock. */ typedef struct xfs_agf { @@ -499,8 +493,13 @@ typedef struct xfs_agf { /* * Freespace and rmap information */ - __be32 agf_roots[XFS_BTNUM_AGF]; /* root blocks */ - __be32 agf_levels[XFS_BTNUM_AGF]; /* btree levels */ + __be32 agf_bno_root; /* bnobt root block */ + __be32 agf_cnt_root; /* cntbt root block */ + __be32 agf_rmap_root; /* rmapbt root block */ + + __be32 agf_bno_level; /* bnobt btree levels */ + __be32 agf_cnt_level; /* cntbt btree levels */ + __be32 agf_rmap_level; /* rmapbt btree levels */ __be32 agf_flfirst; /* first freelist block's index */ __be32 agf_fllast; /* last freelist block's index */ diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c index 5fad7f20b..82052ce78 100644 --- a/libxfs/xfs_rmap_btree.c +++ b/libxfs/xfs_rmap_btree.c @@ -63,13 +63,12 @@ xfs_rmapbt_set_root( { struct xfs_buf *agbp = cur->bc_ag.agbp; struct xfs_agf *agf = agbp->b_addr; - int btnum = cur->bc_btnum; ASSERT(ptr->s != 0); - agf->agf_roots[btnum] = ptr->s; - be32_add_cpu(&agf->agf_levels[btnum], inc); - cur->bc_ag.pag->pagf_levels[btnum] += inc; + agf->agf_rmap_root = ptr->s; + be32_add_cpu(&agf->agf_rmap_level, inc); + cur->bc_ag.pag->pagf_rmap_level += inc; xfs_alloc_log_agf(cur->bc_tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS); } @@ -220,7 +219,7 @@ xfs_rmapbt_init_ptr_from_cur( ASSERT(cur->bc_ag.pag->pag_agno == be32_to_cpu(agf->agf_seqno)); - ptr->s = agf->agf_roots[cur->bc_btnum]; + ptr->s = agf->agf_rmap_root; } /* @@ -340,7 +339,7 @@ xfs_rmapbt_verify( level = be16_to_cpu(block->bb_level); if (pag && xfs_perag_initialised_agf(pag)) { - if (level >= pag->pagf_levels[XFS_BTNUM_RMAPi]) + if (level >= pag->pagf_rmap_level) return __this_address; } else if (level >= mp->m_rmap_maxlevels) return __this_address; @@ -521,7 +520,7 @@ xfs_rmapbt_init_cursor( if (agbp) { struct xfs_agf *agf = agbp->b_addr; - cur->bc_nlevels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]); + cur->bc_nlevels = be32_to_cpu(agf->agf_rmap_level); } return cur; } @@ -541,8 +540,8 @@ xfs_rmapbt_commit_staged_btree( ASSERT(cur->bc_flags & XFS_BTREE_STAGING); - agf->agf_roots[cur->bc_btnum] = cpu_to_be32(afake->af_root); - agf->agf_levels[cur->bc_btnum] = cpu_to_be32(afake->af_levels); + agf->agf_rmap_root = cpu_to_be32(afake->af_root); + agf->agf_rmap_level = cpu_to_be32(afake->af_levels); agf->agf_rmap_blocks = cpu_to_be32(afake->af_blocks); xfs_alloc_log_agf(tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS | XFS_AGF_RMAP_BLOCKS); diff --git a/logprint/log_misc.c b/logprint/log_misc.c index 836156e0d..9d3811340 100644 --- a/logprint/log_misc.c +++ b/logprint/log_misc.c @@ -378,11 +378,11 @@ xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops) be32_to_cpu(agf->agf_seqno), be32_to_cpu(agf->agf_length)); printf(_("root BNO: %d CNT: %d\n"), - be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNOi]), - be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNTi])); + be32_to_cpu(agf->agf_bno_root), + be32_to_cpu(agf->agf_cnt_root)); printf(_("level BNO: %d CNT: %d\n"), - be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNOi]), - be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi])); + be32_to_cpu(agf->agf_bno_level), + be32_to_cpu(agf->agf_cnt_level)); printf(_("1st: %d last: %d cnt: %d " "freeblks: %d longest: %d\n"), be32_to_cpu(agf->agf_flfirst), diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c index 8d3ede190..f436e1091 100644 --- a/logprint/log_print_all.c +++ b/logprint/log_print_all.c @@ -152,11 +152,11 @@ xlog_recover_print_buffer( be32_to_cpu(agf->agf_seqno), be32_to_cpu(agf->agf_length)); printf(_(" root BNO:%d CNT:%d\n"), - be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNOi]), - be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNTi])); + be32_to_cpu(agf->agf_bno_root), + be32_to_cpu(agf->agf_cnt_root)); printf(_(" level BNO:%d CNT:%d\n"), - be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNOi]), - be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNTi])); + be32_to_cpu(agf->agf_bno_level), + be32_to_cpu(agf->agf_cnt_level)); printf(_(" 1st:%d last:%d cnt:%d " "freeblks:%d longest:%d\n"), be32_to_cpu(agf->agf_flfirst), diff --git a/repair/phase5.c b/repair/phase5.c index b0e208f95..6ae2ea575 100644 --- a/repair/phase5.c +++ b/repair/phase5.c @@ -255,20 +255,20 @@ build_agf_agfl( agf->agf_length = cpu_to_be32(mp->m_sb.sb_dblocks - (xfs_rfsblock_t) mp->m_sb.sb_agblocks * agno); - agf->agf_roots[XFS_BTNUM_BNO] = + agf->agf_bno_root = cpu_to_be32(btr_bno->newbt.afake.af_root); - agf->agf_levels[XFS_BTNUM_BNO] = + agf->agf_bno_level = cpu_to_be32(btr_bno->newbt.afake.af_levels); - agf->agf_roots[XFS_BTNUM_CNT] = + agf->agf_cnt_root = cpu_to_be32(btr_cnt->newbt.afake.af_root); - agf->agf_levels[XFS_BTNUM_CNT] = + agf->agf_cnt_level = cpu_to_be32(btr_cnt->newbt.afake.af_levels); agf->agf_freeblks = cpu_to_be32(btr_bno->freeblks); if (xfs_has_rmapbt(mp)) { - agf->agf_roots[XFS_BTNUM_RMAP] = + agf->agf_rmap_root = cpu_to_be32(btr_rmap->newbt.afake.af_root); - agf->agf_levels[XFS_BTNUM_RMAP] = + agf->agf_rmap_level = cpu_to_be32(btr_rmap->newbt.afake.af_levels); agf->agf_rmap_blocks = cpu_to_be32(btr_rmap->newbt.afake.af_blocks); @@ -305,8 +305,8 @@ build_agf_agfl( #ifdef XR_BLD_FREE_TRACE fprintf(stderr, "bno root = %u, bcnt root = %u, indices = %u %u\n", - be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]), - be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]), + be32_to_cpu(agf->agf_bno_root), + be32_to_cpu(agf->agf_cnt_root), XFS_BTNUM_BNO, XFS_BTNUM_CNT); #endif @@ -367,12 +367,12 @@ build_agf_agfl( agf->agf_longest = cpu_to_be32((ext_ptr != NULL) ? ext_ptr->ex_blockcount : 0); - ASSERT(be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNOi]) != - be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNTi])); + ASSERT(be32_to_cpu(agf->agf_bno_root) != + be32_to_cpu(agf->agf_cnt_root)); ASSERT(be32_to_cpu(agf->agf_refcount_root) != - be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNOi])); + be32_to_cpu(agf->agf_bno_root)); ASSERT(be32_to_cpu(agf->agf_refcount_root) != - be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNTi])); + be32_to_cpu(agf->agf_cnt_root)); libxfs_buf_mark_dirty(agf_buf); libxfs_buf_relse(agf_buf); diff --git a/repair/scan.c b/repair/scan.c index 0a77dd679..7e6d94cfa 100644 --- a/repair/scan.c +++ b/repair/scan.c @@ -2364,17 +2364,17 @@ validate_agf( unsigned int levels; struct xfs_perag *pag = libxfs_perag_get(mp, agno); - levels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]); + levels = be32_to_cpu(agf->agf_bno_level); if (levels == 0 || levels > mp->m_alloc_maxlevels) { do_warn(_("bad levels %u for btbno root, agno %d\n"), levels, agno); } - bno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_BNO]); + bno = be32_to_cpu(agf->agf_bno_root); if (libxfs_verify_agbno(pag, bno)) { magic = xfs_has_crc(mp) ? XFS_ABTB_CRC_MAGIC : XFS_ABTB_MAGIC; - scan_sbtree(bno, be32_to_cpu(agf->agf_levels[XFS_BTNUM_BNO]), + scan_sbtree(bno, be32_to_cpu(agf->agf_bno_level), agno, 0, scan_allocbt, 1, magic, agcnts, &xfs_bnobt_buf_ops); } else { @@ -2382,17 +2382,17 @@ validate_agf( bno, agno); } - levels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]); + levels = be32_to_cpu(agf->agf_cnt_level); if (levels == 0 || levels > mp->m_alloc_maxlevels) { do_warn(_("bad levels %u for btbcnt root, agno %d\n"), levels, agno); } - bno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]); + bno = be32_to_cpu(agf->agf_cnt_root); if (libxfs_verify_agbno(pag, bno)) { magic = xfs_has_crc(mp) ? XFS_ABTC_CRC_MAGIC : XFS_ABTC_MAGIC; - scan_sbtree(bno, be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]), + scan_sbtree(bno, be32_to_cpu(agf->agf_cnt_level), agno, 0, scan_allocbt, 1, magic, agcnts, &xfs_cntbt_buf_ops); } else { @@ -2409,14 +2409,14 @@ validate_agf( priv.last_rec.rm_owner = XFS_RMAP_OWN_UNKNOWN; priv.nr_blocks = 0; - levels = be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]); + levels = be32_to_cpu(agf->agf_rmap_level); if (levels == 0 || levels > mp->m_rmap_maxlevels) { do_warn(_("bad levels %u for rmapbt root, agno %d\n"), levels, agno); rmap_avoid_check(); } - bno = be32_to_cpu(agf->agf_roots[XFS_BTNUM_RMAP]); + bno = be32_to_cpu(agf->agf_rmap_root); if (libxfs_verify_agbno(pag, bno)) { scan_sbtree(bno, levels, agno, 0, scan_rmapbt, 1, XFS_RMAP_CRC_MAGIC, &priv,

[065/111] xfs: split the agf_roots and agf_levels arrays

Commit Message

Patch