From: Christoph Hellwig Date: Wed, 22 Jan 2020 16:29:41 +0000 (-0500) Subject: xfs: devirtualize ->node_hdr_from_disk X-Git-Tag: v5.5.0-rc0~74 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=08c16786001e1e684e806f3dda89175032a51904;p=thirdparty%2Fxfsprogs-dev.git xfs: devirtualize ->node_hdr_from_disk Source kernel commit: f475dc4dc7cc98ad653135db174084a55076b1ba Replace the ->node_hdr_from_disk dir ops method with a directly called xfs_da_node_hdr_from_disk helper that takes care of the v4 vs v5 difference. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- diff --git a/db/btdump.c b/db/btdump.c index 7afd0df81..a6d0bc170 100644 --- a/db/btdump.c +++ b/db/btdump.c @@ -212,7 +212,7 @@ dir_has_rightsib( struct xfs_da3_icnode_hdr nhdr; if (level > 0) { - M_DIROPS(mp)->node_hdr_from_disk(&nhdr, block); + libxfs_da3_node_hdr_from_disk(mp, &nhdr, block); return nhdr.forw != 0; } M_DIROPS(mp)->leaf_hdr_from_disk(&lhdr, block); @@ -232,7 +232,7 @@ dir_level( M_DIROPS(mp)->leaf_hdr_from_disk(&lhdr, block); return 0; case cpu_to_be16(XFS_DA_NODE_MAGIC): - M_DIROPS(mp)->node_hdr_from_disk(&nhdr, block); + libxfs_da3_node_hdr_from_disk(mp, &nhdr, block); return nhdr.level; default: return -1; @@ -252,7 +252,7 @@ dir3_level( M_DIROPS(mp)->leaf_hdr_from_disk(&lhdr, block); return 0; case cpu_to_be16(XFS_DA3_NODE_MAGIC): - M_DIROPS(mp)->node_hdr_from_disk(&nhdr, block); + libxfs_da3_node_hdr_from_disk(mp, &nhdr, block); return nhdr.level; default: return -1; @@ -268,7 +268,7 @@ attr_has_rightsib( struct xfs_da3_icnode_hdr nhdr; if (level > 0) { - M_DIROPS(mp)->node_hdr_from_disk(&nhdr, block); + libxfs_da3_node_hdr_from_disk(mp, &nhdr, block); return nhdr.forw != 0; } xfs_attr3_leaf_hdr_to_disk(mp->m_attr_geo, &lhdr, block); @@ -287,7 +287,7 @@ attr_level( xfs_attr3_leaf_hdr_to_disk(mp->m_attr_geo, &lhdr, block); return 0; case cpu_to_be16(XFS_DA_NODE_MAGIC): - M_DIROPS(mp)->node_hdr_from_disk(&nhdr, block); + libxfs_da3_node_hdr_from_disk(mp, &nhdr, block); return nhdr.level; default: return -1; @@ -306,7 +306,7 @@ attr3_level( xfs_attr3_leaf_hdr_to_disk(mp->m_attr_geo, &lhdr, block); return 0; case cpu_to_be16(XFS_DA3_NODE_MAGIC): - M_DIROPS(mp)->node_hdr_from_disk(&nhdr, block); + libxfs_da3_node_hdr_from_disk(mp, &nhdr, block); return nhdr.level; default: return -1; diff --git a/db/check.c b/db/check.c index 5b3bbff80..51c1663f9 100644 --- a/db/check.c +++ b/db/check.c @@ -3319,7 +3319,7 @@ process_leaf_node_dir_v2_int( case XFS_DA_NODE_MAGIC: case XFS_DA3_NODE_MAGIC: node = iocur_top->data; - M_DIROPS(mp)->node_hdr_from_disk(&nodehdr, node); + libxfs_da3_node_hdr_from_disk(mp, &nodehdr, node); if (nodehdr.level < 1 || nodehdr.level > XFS_DA_NODE_MAXDEPTH) { if (!sflag || v) dbprintf(_("bad node block level %d for dir ino " diff --git a/db/metadump.c b/db/metadump.c index f30ea30dc..1ace309e6 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -1881,7 +1881,7 @@ process_single_fsb_objects( struct xfs_da3_icnode_hdr hdr; int used; - M_DIROPS(mp)->node_hdr_from_disk(&hdr, node); + libxfs_da3_node_hdr_from_disk(mp, &hdr, node); used = M_DIROPS(mp)->node_hdr_size; used += hdr.count diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h index 645c9b1b9..bc3b09983 100644 --- a/libxfs/libxfs_api_defs.h +++ b/libxfs/libxfs_api_defs.h @@ -70,6 +70,7 @@ #define xfs_da_hashname libxfs_da_hashname #define xfs_da_shrink_inode libxfs_da_shrink_inode #define xfs_da_read_buf libxfs_da_read_buf +#define xfs_da3_node_hdr_from_disk libxfs_da3_node_hdr_from_disk #define xfs_dir_createname libxfs_dir_createname #define xfs_dir_init libxfs_dir_init #define xfs_dir_lookup libxfs_dir_lookup diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c index 869c1f0d5..4a15a90ee 100644 --- a/libxfs/xfs_attr_leaf.c +++ b/libxfs/xfs_attr_leaf.c @@ -1181,7 +1181,7 @@ xfs_attr3_leaf_to_node( if (error) goto out; node = bp1->b_addr; - dp->d_ops->node_hdr_from_disk(&icnodehdr, node); + xfs_da3_node_hdr_from_disk(mp, &icnodehdr, node); btree = dp->d_ops->node_tree_p(node); leaf = bp2->b_addr; diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c index d88435c46..85d07ec25 100644 --- a/libxfs/xfs_da_btree.c +++ b/libxfs/xfs_da_btree.c @@ -107,6 +107,31 @@ xfs_da_state_free(xfs_da_state_t *state) kmem_zone_free(xfs_da_state_zone, state); } +void +xfs_da3_node_hdr_from_disk( + struct xfs_mount *mp, + struct xfs_da3_icnode_hdr *to, + struct xfs_da_intnode *from) +{ + if (xfs_sb_version_hascrc(&mp->m_sb)) { + struct xfs_da3_intnode *from3 = (struct xfs_da3_intnode *)from; + + to->forw = be32_to_cpu(from3->hdr.info.hdr.forw); + to->back = be32_to_cpu(from3->hdr.info.hdr.back); + to->magic = be16_to_cpu(from3->hdr.info.hdr.magic); + to->count = be16_to_cpu(from3->hdr.__count); + to->level = be16_to_cpu(from3->hdr.__level); + ASSERT(to->magic == XFS_DA3_NODE_MAGIC); + } else { + to->forw = be32_to_cpu(from->hdr.info.forw); + to->back = be32_to_cpu(from->hdr.info.back); + to->magic = be16_to_cpu(from->hdr.info.magic); + to->count = be16_to_cpu(from->hdr.__count); + to->level = be16_to_cpu(from->hdr.__level); + ASSERT(to->magic == XFS_DA_NODE_MAGIC); + } +} + /* * Verify an xfs_da3_blkinfo structure. Note that the da3 fields are only * accessible on v5 filesystems. This header format is common across da node, @@ -142,12 +167,9 @@ xfs_da3_node_verify( struct xfs_mount *mp = bp->b_mount; struct xfs_da_intnode *hdr = bp->b_addr; struct xfs_da3_icnode_hdr ichdr; - const struct xfs_dir_ops *ops; xfs_failaddr_t fa; - ops = xfs_dir_get_ops(mp, NULL); - - ops->node_hdr_from_disk(&ichdr, hdr); + xfs_da3_node_hdr_from_disk(mp, &ichdr, hdr); fa = xfs_da3_blkinfo_verify(bp, bp->b_addr); if (fa) @@ -576,7 +598,7 @@ xfs_da3_root_split( oldroot->hdr.info.magic == cpu_to_be16(XFS_DA3_NODE_MAGIC)) { struct xfs_da3_icnode_hdr icnodehdr; - dp->d_ops->node_hdr_from_disk(&icnodehdr, oldroot); + xfs_da3_node_hdr_from_disk(dp->i_mount, &icnodehdr, oldroot); btree = dp->d_ops->node_tree_p(oldroot); size = (int)((char *)&btree[icnodehdr.count] - (char *)oldroot); level = icnodehdr.level; @@ -636,7 +658,7 @@ xfs_da3_root_split( return error; node = bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); btree = dp->d_ops->node_tree_p(node); btree[0].hashval = cpu_to_be32(blk1->hashval); btree[0].before = cpu_to_be32(blk1->blkno); @@ -685,7 +707,7 @@ xfs_da3_node_split( trace_xfs_da_node_split(state->args); node = oldblk->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); /* * With V2 dirs the extra block is data or freespace. @@ -732,7 +754,7 @@ xfs_da3_node_split( * If we had double-split op below us, then add the extra block too. */ node = oldblk->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); if (oldblk->index <= nodehdr.count) { oldblk->index++; xfs_da3_node_add(state, oldblk, addblk); @@ -787,8 +809,8 @@ xfs_da3_node_rebalance( node1 = blk1->bp->b_addr; node2 = blk2->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr1, node1); - dp->d_ops->node_hdr_from_disk(&nodehdr2, node2); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr1, node1); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr2, node2); btree1 = dp->d_ops->node_tree_p(node1); btree2 = dp->d_ops->node_tree_p(node2); @@ -803,8 +825,8 @@ xfs_da3_node_rebalance( tmpnode = node1; node1 = node2; node2 = tmpnode; - dp->d_ops->node_hdr_from_disk(&nodehdr1, node1); - dp->d_ops->node_hdr_from_disk(&nodehdr2, node2); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr1, node1); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr2, node2); btree1 = dp->d_ops->node_tree_p(node1); btree2 = dp->d_ops->node_tree_p(node2); swap = 1; @@ -885,8 +907,8 @@ xfs_da3_node_rebalance( if (swap) { node1 = blk1->bp->b_addr; node2 = blk2->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr1, node1); - dp->d_ops->node_hdr_from_disk(&nodehdr2, node2); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr1, node1); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr2, node2); btree1 = dp->d_ops->node_tree_p(node1); btree2 = dp->d_ops->node_tree_p(node2); } @@ -920,7 +942,7 @@ xfs_da3_node_add( trace_xfs_da_node_add(state->args); node = oldblk->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); btree = dp->d_ops->node_tree_p(node); ASSERT(oldblk->index >= 0 && oldblk->index <= nodehdr.count); @@ -1091,7 +1113,7 @@ xfs_da3_root_join( args = state->args; oldroot = root_blk->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&oldroothdr, oldroot); + xfs_da3_node_hdr_from_disk(dp->i_mount, &oldroothdr, oldroot); ASSERT(oldroothdr.forw == 0); ASSERT(oldroothdr.back == 0); @@ -1171,7 +1193,7 @@ xfs_da3_node_toosmall( blk = &state->path.blk[ state->path.active-1 ]; info = blk->bp->b_addr; node = (xfs_da_intnode_t *)info; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); if (nodehdr.count > (state->args->geo->node_ents >> 1)) { *action = 0; /* blk over 50%, don't try to join */ return 0; /* blk over 50%, don't try to join */ @@ -1229,7 +1251,7 @@ xfs_da3_node_toosmall( return error; node = bp->b_addr; - dp->d_ops->node_hdr_from_disk(&thdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &thdr, node); xfs_trans_brelse(state->args->trans, bp); if (count - thdr.count >= 0) @@ -1276,7 +1298,7 @@ xfs_da3_node_lasthash( struct xfs_da3_icnode_hdr nodehdr; node = bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); if (count) *count = nodehdr.count; if (!nodehdr.count) @@ -1327,7 +1349,7 @@ xfs_da3_fixhashpath( struct xfs_da3_icnode_hdr nodehdr; node = blk->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); btree = dp->d_ops->node_tree_p(node); if (be32_to_cpu(btree[blk->index].hashval) == lasthash) break; @@ -1359,7 +1381,7 @@ xfs_da3_node_remove( trace_xfs_da_node_remove(state->args); node = drop_blk->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); ASSERT(drop_blk->index < nodehdr.count); ASSERT(drop_blk->index >= 0); @@ -1415,8 +1437,8 @@ xfs_da3_node_unbalance( drop_node = drop_blk->bp->b_addr; save_node = save_blk->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&drop_hdr, drop_node); - dp->d_ops->node_hdr_from_disk(&save_hdr, save_node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &drop_hdr, drop_node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &save_hdr, save_node); drop_btree = dp->d_ops->node_tree_p(drop_node); save_btree = dp->d_ops->node_tree_p(save_node); tp = state->args->trans; @@ -1551,7 +1573,7 @@ xfs_da3_node_lookup_int( * Search an intermediate node for a match. */ node = blk->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); btree = dp->d_ops->node_tree_p(node); /* Tree taller than we can handle; bail out! */ @@ -1687,8 +1709,8 @@ xfs_da3_node_order( node1 = node1_bp->b_addr; node2 = node2_bp->b_addr; - dp->d_ops->node_hdr_from_disk(&node1hdr, node1); - dp->d_ops->node_hdr_from_disk(&node2hdr, node2); + xfs_da3_node_hdr_from_disk(dp->i_mount, &node1hdr, node1); + xfs_da3_node_hdr_from_disk(dp->i_mount, &node2hdr, node2); btree1 = dp->d_ops->node_tree_p(node1); btree2 = dp->d_ops->node_tree_p(node2); @@ -1911,7 +1933,7 @@ xfs_da3_path_shift( level = (path->active-1) - 1; /* skip bottom layer in path */ for (blk = &path->blk[level]; level >= 0; blk--, level--) { node = blk->bp->b_addr; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); btree = dp->d_ops->node_tree_p(node); if (forward && (blk->index < nodehdr.count - 1)) { @@ -1972,7 +1994,7 @@ xfs_da3_path_shift( case XFS_DA3_NODE_MAGIC: blk->magic = XFS_DA_NODE_MAGIC; node = (xfs_da_intnode_t *)info; - dp->d_ops->node_hdr_from_disk(&nodehdr, node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &nodehdr, node); btree = dp->d_ops->node_tree_p(node); blk->hashval = be32_to_cpu(btree[nodehdr.count - 1].hashval); if (forward) @@ -2257,7 +2279,7 @@ xfs_da3_swap_lastblock( struct xfs_da3_icnode_hdr deadhdr; dead_node = (xfs_da_intnode_t *)dead_info; - dp->d_ops->node_hdr_from_disk(&deadhdr, dead_node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &deadhdr, dead_node); btree = dp->d_ops->node_tree_p(dead_node); dead_level = deadhdr.level; dead_hash = be32_to_cpu(btree[deadhdr.count - 1].hashval); @@ -2317,7 +2339,7 @@ xfs_da3_swap_lastblock( if (error) goto done; par_node = par_buf->b_addr; - dp->d_ops->node_hdr_from_disk(&par_hdr, par_node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &par_hdr, par_node); if (level >= 0 && level != par_hdr.level + 1) { XFS_ERROR_REPORT("xfs_da_swap_lastblock(4)", XFS_ERRLEVEL_LOW, mp); @@ -2368,7 +2390,7 @@ xfs_da3_swap_lastblock( if (error) goto done; par_node = par_buf->b_addr; - dp->d_ops->node_hdr_from_disk(&par_hdr, par_node); + xfs_da3_node_hdr_from_disk(dp->i_mount, &par_hdr, par_node); if (par_hdr.level != level) { XFS_ERROR_REPORT("xfs_da_swap_lastblock(7)", XFS_ERRLEVEL_LOW, mp); diff --git a/libxfs/xfs_da_btree.h b/libxfs/xfs_da_btree.h index 01b0bbe8b..21dc03c81 100644 --- a/libxfs/xfs_da_btree.h +++ b/libxfs/xfs_da_btree.h @@ -215,6 +215,9 @@ enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args, xfs_da_state_t *xfs_da_state_alloc(void); void xfs_da_state_free(xfs_da_state_t *state); +void xfs_da3_node_hdr_from_disk(struct xfs_mount *mp, + struct xfs_da3_icnode_hdr *to, struct xfs_da_intnode *from); + extern struct kmem_zone *xfs_da_state_zone; extern const struct xfs_nameops xfs_default_nameops; diff --git a/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c index 57f4e1855..bc29147ae 100644 --- a/libxfs/xfs_da_format.c +++ b/libxfs/xfs_da_format.c @@ -510,19 +510,6 @@ xfs_da3_node_tree_p(struct xfs_da_intnode *dap) return ((struct xfs_da3_intnode *)dap)->__btree; } -static void -xfs_da2_node_hdr_from_disk( - struct xfs_da3_icnode_hdr *to, - struct xfs_da_intnode *from) -{ - ASSERT(from->hdr.info.magic == cpu_to_be16(XFS_DA_NODE_MAGIC)); - to->forw = be32_to_cpu(from->hdr.info.forw); - to->back = be32_to_cpu(from->hdr.info.back); - to->magic = be16_to_cpu(from->hdr.info.magic); - to->count = be16_to_cpu(from->hdr.__count); - to->level = be16_to_cpu(from->hdr.__level); -} - static void xfs_da2_node_hdr_to_disk( struct xfs_da_intnode *to, @@ -536,21 +523,6 @@ xfs_da2_node_hdr_to_disk( to->hdr.__level = cpu_to_be16(from->level); } -static void -xfs_da3_node_hdr_from_disk( - struct xfs_da3_icnode_hdr *to, - struct xfs_da_intnode *from) -{ - struct xfs_da3_node_hdr *hdr3 = (struct xfs_da3_node_hdr *)from; - - ASSERT(from->hdr.info.magic == cpu_to_be16(XFS_DA3_NODE_MAGIC)); - to->forw = be32_to_cpu(hdr3->info.hdr.forw); - to->back = be32_to_cpu(hdr3->info.hdr.back); - to->magic = be16_to_cpu(hdr3->info.hdr.magic); - to->count = be16_to_cpu(hdr3->__count); - to->level = be16_to_cpu(hdr3->__level); -} - static void xfs_da3_node_hdr_to_disk( struct xfs_da_intnode *to, @@ -727,7 +699,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = { .node_hdr_size = sizeof(struct xfs_da_node_hdr), .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, - .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p, .free_hdr_size = sizeof(struct xfs_dir2_free_hdr), @@ -777,7 +748,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = { .node_hdr_size = sizeof(struct xfs_da_node_hdr), .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, - .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p, .free_hdr_size = sizeof(struct xfs_dir2_free_hdr), @@ -827,7 +797,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = { .node_hdr_size = sizeof(struct xfs_da3_node_hdr), .node_hdr_to_disk = xfs_da3_node_hdr_to_disk, - .node_hdr_from_disk = xfs_da3_node_hdr_from_disk, .node_tree_p = xfs_da3_node_tree_p, .free_hdr_size = sizeof(struct xfs_dir3_free_hdr), @@ -842,14 +811,12 @@ static const struct xfs_dir_ops xfs_dir3_ops = { static const struct xfs_dir_ops xfs_dir2_nondir_ops = { .node_hdr_size = sizeof(struct xfs_da_node_hdr), .node_hdr_to_disk = xfs_da2_node_hdr_to_disk, - .node_hdr_from_disk = xfs_da2_node_hdr_from_disk, .node_tree_p = xfs_da2_node_tree_p, }; static const struct xfs_dir_ops xfs_dir3_nondir_ops = { .node_hdr_size = sizeof(struct xfs_da3_node_hdr), .node_hdr_to_disk = xfs_da3_node_hdr_to_disk, - .node_hdr_from_disk = xfs_da3_node_hdr_from_disk, .node_tree_p = xfs_da3_node_tree_p, }; diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h index e170792c0..573043f59 100644 --- a/libxfs/xfs_dir2.h +++ b/libxfs/xfs_dir2.h @@ -84,8 +84,6 @@ struct xfs_dir_ops { int node_hdr_size; void (*node_hdr_to_disk)(struct xfs_da_intnode *to, struct xfs_da3_icnode_hdr *from); - void (*node_hdr_from_disk)(struct xfs_da3_icnode_hdr *to, - struct xfs_da_intnode *from); struct xfs_da_node_entry * (*node_tree_p)(struct xfs_da_intnode *dap); diff --git a/repair/da_util.c b/repair/da_util.c index 8c818ea1a..1e56670d8 100644 --- a/repair/da_util.c +++ b/repair/da_util.c @@ -135,7 +135,7 @@ _("can't read %s block %u for inode %" PRIu64 "\n"), } node = bp->b_addr; - M_DIROPS(mp)->node_hdr_from_disk(&nodehdr, node); + libxfs_da3_node_hdr_from_disk(mp, &nodehdr, node); if (whichfork == XFS_DATA_FORK && (nodehdr.magic == XFS_DIR2_LEAFN_MAGIC || @@ -316,7 +316,7 @@ verify_final_da_path( entry = cursor->level[this_level].index; node = cursor->level[this_level].bp->b_addr; btree = M_DIROPS(mp)->node_tree_p(node); - M_DIROPS(mp)->node_hdr_from_disk(&nodehdr, node); + libxfs_da3_node_hdr_from_disk(mp, &nodehdr, node); /* * check internal block consistency on this level -- ensure @@ -505,7 +505,7 @@ verify_da_path( entry = cursor->level[this_level].index; node = cursor->level[this_level].bp->b_addr; btree = M_DIROPS(mp)->node_tree_p(node); - M_DIROPS(mp)->node_hdr_from_disk(&nodehdr, node); + libxfs_da3_node_hdr_from_disk(mp, &nodehdr, node); /* No entries in this node? Tree is corrupt. */ if (nodehdr.count == 0) @@ -565,7 +565,7 @@ _("can't read %s block %u for inode %" PRIu64 "\n"), newnode = bp->b_addr; btree = M_DIROPS(mp)->node_tree_p(newnode); - M_DIROPS(mp)->node_hdr_from_disk(&nodehdr, newnode); + libxfs_da3_node_hdr_from_disk(mp, &nodehdr, newnode); /* * verify magic number and back pointer, sanity-check