[052/111] xfs: don't override bc_ops for staging btrees

Message ID	171744040155.1443973.5253273451160917827.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 77B96259C for <linux-xfs@vger.kernel.org>; Mon, 3 Jun 2024 19:05:37 +0000 (UTC) Date: Mon, 03 Jun 2024 12:05:36 -0700 Subject: [PATCH 052/111] xfs: don't override bc_ops for staging btrees 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: <171744040155.1443973.5253273451160917827.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 b18ac7045..6b17037f8 100644 --- a/libxfs/xfs_alloc_btree.c +++ b/libxfs/xfs_alloc_btree.c @@ -592,11 +592,7 @@ xfs_allocbt_commit_staged_btree( agf->agf_levels[cur->bc_btnum] = cpu_to_be32(afake->af_levels); xfs_alloc_log_agf(tp, agbp, XFS_AGF_ROOTS | XFS_AGF_LEVELS); - if (cur->bc_btnum == XFS_BTNUM_BNO) { - xfs_btree_commit_afakeroot(cur, tp, agbp, &xfs_bnobt_ops); - } else { - xfs_btree_commit_afakeroot(cur, tp, agbp, &xfs_cntbt_ops); - } + xfs_btree_commit_afakeroot(cur, tp, agbp); } /* Calculate number of records in an alloc btree block. */ diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c index 7fc325fd3..611f5ed96 100644 --- a/libxfs/xfs_bmap_btree.c +++ b/libxfs/xfs_bmap_btree.c @@ -608,7 +608,6 @@ xfs_bmbt_stage_cursor( struct xbtree_ifakeroot *ifake) { struct xfs_btree_cur *cur; - struct xfs_btree_ops *ops; /* data fork always has larger maxheight */ cur = xfs_bmbt_init_common(mp, NULL, ip, XFS_DATA_FORK); @@ -617,8 +616,7 @@ xfs_bmbt_stage_cursor( /* Don't let anyone think we're attached to the real fork yet. */ cur->bc_ino.whichfork = -1; - xfs_btree_stage_ifakeroot(cur, ifake, &ops); - ops->update_cursor = NULL; + xfs_btree_stage_ifakeroot(cur, ifake); return cur; } @@ -662,7 +660,7 @@ xfs_bmbt_commit_staged_btree( break; } xfs_trans_log_inode(tp, cur->bc_ino.ip, flags); - xfs_btree_commit_ifakeroot(cur, tp, whichfork, &xfs_bmbt_ops); + xfs_btree_commit_ifakeroot(cur, tp, whichfork); } /* diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c index f59fa54e3..42a1ed786 100644 --- a/libxfs/xfs_btree.c +++ b/libxfs/xfs_btree.c @@ -404,6 +404,15 @@ xfs_btree_free_block( trace_xfs_btree_free_block(cur, bp); + /* + * Don't allow block freeing for a staging cursor, because staging + * cursors do not support regular btree modifications. + */ + if (unlikely(cur->bc_flags & XFS_BTREE_STAGING)) { + ASSERT(0); + return -EFSCORRUPTED; + } + error = cur->bc_ops->free_block(cur, bp); if (!error) { xfs_trans_binval(cur->bc_tp, bp); @@ -455,8 +464,6 @@ xfs_btree_del_cursor( break; } - if (unlikely(cur->bc_flags & XFS_BTREE_STAGING)) - kfree(cur->bc_ops); kmem_cache_free(cur->bc_cache, cur); } @@ -464,20 +471,26 @@ xfs_btree_del_cursor( * Duplicate the btree cursor. * Allocate a new one, copy the record, re-get the buffers. */ -int /* error */ +int /* error */ xfs_btree_dup_cursor( - struct xfs_btree_cur *cur, /* input cursor */ - struct xfs_btree_cur **ncur) /* output cursor */ + struct xfs_btree_cur *cur, /* input cursor */ + struct xfs_btree_cur **ncur) /* output cursor */ { - struct xfs_buf *bp; /* btree block's buffer pointer */ - int error; /* error return value */ - int i; /* level number of btree block */ - xfs_mount_t *mp; /* mount structure for filesystem */ - struct xfs_btree_cur *new; /* new cursor value */ - xfs_trans_t *tp; /* transaction pointer, can be NULL */ + struct xfs_mount *mp = cur->bc_mp; + struct xfs_trans *tp = cur->bc_tp; + struct xfs_buf *bp; + struct xfs_btree_cur *new; + int error; + int i; - tp = cur->bc_tp; - mp = cur->bc_mp; + /* + * Don't allow staging cursors to be duplicated because they're supposed + * to be kept private to a single thread. + */ + if (unlikely(cur->bc_flags & XFS_BTREE_STAGING)) { + ASSERT(0); + return -EFSCORRUPTED; + } /* * Allocate a new cursor like the old one. @@ -1892,6 +1905,8 @@ xfs_btree_init_ptr_from_cur( * in xfs_btree_lookup_get_block and don't need a pointer here. */ ptr->l = 0; + } else if (cur->bc_flags & XFS_BTREE_STAGING) { + ptr->s = cpu_to_be32(cur->bc_ag.afake->af_root); } else { cur->bc_ops->init_ptr_from_cur(cur, ptr); } @@ -2713,6 +2728,18 @@ xfs_btree_alloc_block( { int error; + /* + * Don't allow block allocation for a staging cursor, because staging + * cursors do not support regular btree modifications. + * + * Bulk loading uses a separate callback to obtain new blocks from a + * preallocated list, which prevents ENOSPC failures during loading. + */ + if (unlikely(cur->bc_flags & XFS_BTREE_STAGING)) { + ASSERT(0); + return -EFSCORRUPTED; + } + error = cur->bc_ops->alloc_block(cur, hint_block, new_block, stat); trace_xfs_btree_alloc_block(cur, new_block, *stat, error); return error; @@ -3113,6 +3140,21 @@ xfs_btree_new_iroot( return error; } +static void +xfs_btree_set_root( + struct xfs_btree_cur *cur, + const union xfs_btree_ptr *ptr, + int inc) +{ + if (cur->bc_flags & XFS_BTREE_STAGING) { + /* Update the btree root information for a per-AG fake root. */ + cur->bc_ag.afake->af_root = be32_to_cpu(ptr->s); + cur->bc_ag.afake->af_levels += inc; + } else { + cur->bc_ops->set_root(cur, ptr, inc); + } +} + /* * Allocate a new root block, fill it in. */ @@ -3153,7 +3195,7 @@ xfs_btree_new_root( goto error0; /* Set the root in the holding structure increasing the level by 1. */ - cur->bc_ops->set_root(cur, &lptr, 1); + xfs_btree_set_root(cur, &lptr, 1); /* * At the previous root level there are now two blocks: the old root, @@ -3581,7 +3623,8 @@ xfs_btree_insert( if (pcur != cur && (ncur || xfs_btree_ptr_is_null(cur, &nptr))) { /* Save the state from the cursor before we trash it */ - if (cur->bc_ops->update_cursor) + if (cur->bc_ops->update_cursor && + !(cur->bc_flags & XFS_BTREE_STAGING)) cur->bc_ops->update_cursor(pcur, cur); cur->bc_nlevels = pcur->bc_nlevels; xfs_btree_del_cursor(pcur, XFS_BTREE_NOERROR); @@ -3724,7 +3767,7 @@ xfs_btree_kill_root( * Update the root pointer, decreasing the level by 1 and then * free the old root. */ - cur->bc_ops->set_root(cur, newroot, -1); + xfs_btree_set_root(cur, newroot, -1); error = xfs_btree_free_block(cur, bp); if (error) diff --git a/libxfs/xfs_btree_staging.c b/libxfs/xfs_btree_staging.c index 656bad6cd..5a988a8bf 100644 --- a/libxfs/xfs_btree_staging.c +++ b/libxfs/xfs_btree_staging.c @@ -38,63 +38,6 @@ * specific btree type to commit the new btree into the filesystem. */ -/* - * Don't allow staging cursors to be duplicated because they're supposed to be - * kept private to a single thread. - */ -STATIC struct xfs_btree_cur * -xfs_btree_fakeroot_dup_cursor( - struct xfs_btree_cur *cur) -{ - ASSERT(0); - return NULL; -} - -/* - * Don't allow block allocation for a staging cursor, because staging cursors - * do not support regular btree modifications. - * - * Bulk loading uses a separate callback to obtain new blocks from a - * preallocated list, which prevents ENOSPC failures during loading. - */ -STATIC int -xfs_btree_fakeroot_alloc_block( - struct xfs_btree_cur *cur, - const union xfs_btree_ptr *start_bno, - union xfs_btree_ptr *new_bno, - int *stat) -{ - ASSERT(0); - return -EFSCORRUPTED; -} - -/* - * Don't allow block freeing for a staging cursor, because staging cursors - * do not support regular btree modifications. - */ -STATIC int -xfs_btree_fakeroot_free_block( - struct xfs_btree_cur *cur, - struct xfs_buf *bp) -{ - ASSERT(0); - return -EFSCORRUPTED; -} - -/* Initialize a pointer to the root block from the fakeroot. */ -STATIC void -xfs_btree_fakeroot_init_ptr_from_cur( - struct xfs_btree_cur *cur, - union xfs_btree_ptr *ptr) -{ - struct xbtree_afakeroot *afake; - - ASSERT(cur->bc_flags & XFS_BTREE_STAGING); - - afake = cur->bc_ag.afake; - ptr->s = cpu_to_be32(afake->af_root); -} - /* * Bulk Loading for AG Btrees * ========================== @@ -109,47 +52,20 @@ xfs_btree_fakeroot_init_ptr_from_cur( * cursor into a regular btree cursor. */ -/* Update the btree root information for a per-AG fake root. */ -STATIC void -xfs_btree_afakeroot_set_root( - struct xfs_btree_cur *cur, - const union xfs_btree_ptr *ptr, - int inc) -{ - struct xbtree_afakeroot *afake = cur->bc_ag.afake; - - ASSERT(cur->bc_flags & XFS_BTREE_STAGING); - afake->af_root = be32_to_cpu(ptr->s); - afake->af_levels += inc; -} - /* * Initialize a AG-rooted btree cursor with the given AG btree fake root. - * The btree cursor's bc_ops will be overridden as needed to make the staging - * functionality work. */ void xfs_btree_stage_afakeroot( struct xfs_btree_cur *cur, struct xbtree_afakeroot *afake) { - struct xfs_btree_ops *nops; - ASSERT(!(cur->bc_flags & XFS_BTREE_STAGING)); ASSERT(cur->bc_ops->type != XFS_BTREE_TYPE_INODE); ASSERT(cur->bc_tp == NULL); - nops = kmalloc(sizeof(struct xfs_btree_ops), GFP_KERNEL | __GFP_NOFAIL); - memcpy(nops, cur->bc_ops, sizeof(struct xfs_btree_ops)); - nops->alloc_block = xfs_btree_fakeroot_alloc_block; - nops->free_block = xfs_btree_fakeroot_free_block; - nops->init_ptr_from_cur = xfs_btree_fakeroot_init_ptr_from_cur; - nops->set_root = xfs_btree_afakeroot_set_root; - nops->dup_cursor = xfs_btree_fakeroot_dup_cursor; - cur->bc_ag.afake = afake; cur->bc_nlevels = afake->af_levels; - cur->bc_ops = nops; cur->bc_flags |= XFS_BTREE_STAGING; } @@ -163,18 +79,15 @@ void xfs_btree_commit_afakeroot( struct xfs_btree_cur *cur, struct xfs_trans *tp, - struct xfs_buf *agbp, - const struct xfs_btree_ops *ops) + struct xfs_buf *agbp) { ASSERT(cur->bc_flags & XFS_BTREE_STAGING); ASSERT(cur->bc_tp == NULL); trace_xfs_btree_commit_afakeroot(cur); - kfree((void *)cur->bc_ops); cur->bc_ag.afake = NULL; cur->bc_ag.agbp = agbp; - cur->bc_ops = ops; cur->bc_flags &= ~XFS_BTREE_STAGING; cur->bc_tp = tp; } @@ -212,28 +125,15 @@ xfs_btree_commit_afakeroot( void xfs_btree_stage_ifakeroot( struct xfs_btree_cur *cur, - struct xbtree_ifakeroot *ifake, - struct xfs_btree_ops **new_ops) + struct xbtree_ifakeroot *ifake) { - struct xfs_btree_ops *nops; - ASSERT(!(cur->bc_flags & XFS_BTREE_STAGING)); ASSERT(cur->bc_ops->type == XFS_BTREE_TYPE_INODE); ASSERT(cur->bc_tp == NULL); - nops = kmalloc(sizeof(struct xfs_btree_ops), GFP_KERNEL | __GFP_NOFAIL); - memcpy(nops, cur->bc_ops, sizeof(struct xfs_btree_ops)); - nops->alloc_block = xfs_btree_fakeroot_alloc_block; - nops->free_block = xfs_btree_fakeroot_free_block; - nops->dup_cursor = xfs_btree_fakeroot_dup_cursor; - cur->bc_ino.ifake = ifake; cur->bc_nlevels = ifake->if_levels; - cur->bc_ops = nops; cur->bc_flags |= XFS_BTREE_STAGING; - - if (new_ops) - *new_ops = nops; } /* @@ -246,18 +146,15 @@ void xfs_btree_commit_ifakeroot( struct xfs_btree_cur *cur, struct xfs_trans *tp, - int whichfork, - const struct xfs_btree_ops *ops) + int whichfork) { ASSERT(cur->bc_flags & XFS_BTREE_STAGING); ASSERT(cur->bc_tp == NULL); trace_xfs_btree_commit_ifakeroot(cur); - kfree((void *)cur->bc_ops); cur->bc_ino.ifake = NULL; cur->bc_ino.whichfork = whichfork; - cur->bc_ops = ops; cur->bc_flags &= ~XFS_BTREE_STAGING; cur->bc_tp = tp; } diff --git a/libxfs/xfs_btree_staging.h b/libxfs/xfs_btree_staging.h index 8e29cd3cc..0c9c2ffb1 100644 --- a/libxfs/xfs_btree_staging.h +++ b/libxfs/xfs_btree_staging.h @@ -22,7 +22,7 @@ struct xbtree_afakeroot { void xfs_btree_stage_afakeroot(struct xfs_btree_cur *cur, struct xbtree_afakeroot *afake); void xfs_btree_commit_afakeroot(struct xfs_btree_cur *cur, struct xfs_trans *tp, - struct xfs_buf *agbp, const struct xfs_btree_ops *ops); + struct xfs_buf *agbp); /* Fake root for an inode-rooted btree. */ struct xbtree_ifakeroot { @@ -41,10 +41,9 @@ struct xbtree_ifakeroot { /* Cursor interactions with fake roots for inode-rooted btrees. */ void xfs_btree_stage_ifakeroot(struct xfs_btree_cur *cur, - struct xbtree_ifakeroot *ifake, - struct xfs_btree_ops **new_ops); + struct xbtree_ifakeroot *ifake); void xfs_btree_commit_ifakeroot(struct xfs_btree_cur *cur, struct xfs_trans *tp, - int whichfork, const struct xfs_btree_ops *ops); + int whichfork); /* Bulk loading of staged btrees. */ typedef int (*xfs_btree_bload_get_records_fn)(struct xfs_btree_cur *cur, diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c index 79ab04684..87471ba14 100644 --- a/libxfs/xfs_ialloc_btree.c +++ b/libxfs/xfs_ialloc_btree.c @@ -536,7 +536,7 @@ xfs_inobt_commit_staged_btree( fields |= XFS_AGI_IBLOCKS; } xfs_ialloc_log_agi(tp, agbp, fields); - xfs_btree_commit_afakeroot(cur, tp, agbp, &xfs_inobt_ops); + xfs_btree_commit_afakeroot(cur, tp, agbp); } else { fields = XFS_AGI_FREE_ROOT | XFS_AGI_FREE_LEVEL; agi->agi_free_root = cpu_to_be32(afake->af_root); @@ -546,7 +546,7 @@ xfs_inobt_commit_staged_btree( fields |= XFS_AGI_IBLOCKS; } xfs_ialloc_log_agi(tp, agbp, fields); - xfs_btree_commit_afakeroot(cur, tp, agbp, &xfs_finobt_ops); + xfs_btree_commit_afakeroot(cur, tp, agbp); } } diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c index 529091a6b..45bfb39e0 100644 --- a/libxfs/xfs_refcount_btree.c +++ b/libxfs/xfs_refcount_btree.c @@ -418,7 +418,7 @@ xfs_refcountbt_commit_staged_btree( xfs_alloc_log_agf(tp, agbp, XFS_AGF_REFCOUNT_BLOCKS | XFS_AGF_REFCOUNT_ROOT | XFS_AGF_REFCOUNT_LEVEL); - xfs_btree_commit_afakeroot(cur, tp, agbp, &xfs_refcountbt_ops); + xfs_btree_commit_afakeroot(cur, tp, agbp); } /* Calculate number of records in a refcount btree block. */ diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c index 311261df3..52c820108 100644 --- a/libxfs/xfs_rmap_btree.c +++ b/libxfs/xfs_rmap_btree.c @@ -565,7 +565,7 @@ xfs_rmapbt_commit_staged_btree( 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); - xfs_btree_commit_afakeroot(cur, tp, agbp, &xfs_rmapbt_ops); + xfs_btree_commit_afakeroot(cur, tp, agbp); } /* Calculate number of records in a reverse mapping btree block. */

[052/111] xfs: don't override bc_ops for staging btrees

Commit Message

Patch