[08/34] xfs: devirtualize ->leaf_hdr_to_disk

Message ID	20191101220719.29100-9-hch@lst.de (mailing list archive)
State	Superseded, archived
Headers	show Return-Path: <SRS0=5kOL=YZ=vger.kernel.org=linux-xfs-owner@kernel.org> From: Christoph Hellwig <hch@lst.de> To: linux-xfs@vger.kernel.org Subject: [PATCH 08/34] xfs: devirtualize ->leaf_hdr_to_disk Date: Fri, 1 Nov 2019 15:06:53 -0700 Message-Id: <20191101220719.29100-9-hch@lst.de> In-Reply-To: <20191101220719.29100-1-hch@lst.de> References: <20191101220719.29100-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk
Series	[01/34] xfs: move incore structures out of xfs_da_format.h \| expand [01/34] xfs: move incore structures out of xfs_da_format.h [02/34] xfs: refactor btree node scrubbing [03/34] xfs: devirtualize ->node_hdr_from_disk [04/34] xfs: devirtualize ->node_hdr_to_disk [05/34] xfs: add a btree entries pointer to struct xfs_da3_icnode_hdr [06/34] xfs: move the node header size to struct xfs_da_geometry [07/34] xfs: devirtualize ->leaf_hdr_from_disk [08/34] xfs: devirtualize ->leaf_hdr_to_disk [09/34] xfs: add a entries pointer to struct xfs_dir3_icleaf_hdr [10/34] xfs: move the dir2 leaf header size to struct xfs_da_geometry [11/34] xfs: move the max dir2 leaf entries count to struct xfs_da_geometry [12/34] xfs: devirtualize ->free_hdr_from_disk [13/34] xfs: devirtualize ->free_hdr_to_disk [14/34] xfs: make the xfs_dir3_icfree_hdr available to xfs_dir2_node_addname_int [15/34] xfs: add a bests pointer to struct xfs_dir3_icfree_hdr [16/34] xfs: move the dir2 free header size to struct xfs_da_geometry [17/34] xfs: move the max dir2 free bests count to struct xfs_da_geometry [18/34] xfs: devirtualize ->db_to_fdb and ->db_to_fdindex [19/34] xfs: devirtualize ->sf_get_parent_ino and ->sf_put_parent_ino [20/34] xfs: devirtualize ->sf_entsize and ->sf_nextentry [21/34] xfs: devirtualize ->sf_get_ino and ->sf_put_ino [22/34] xfs: devirtualize ->sf_get_ftype and ->sf_put_ftype [23/34] xfs: remove the ->data_dot_entry_p and ->data_dotdot_entry_p methods [24/34] xfs: remove the unused ->data_first_entry_p method [25/34] xfs: remove the ->data_entry_entry_p method [26/34] xfs: devirtualize ->data_entsize [27/34] xfs: devirtualize ->data_entry_tag_p [28/34] xfs: move the dir2 data block fixed offsets to struct xfs_da_geometry [29/34] xfs: cleanup xfs_dir2_data_entsize [30/34] xfs: devirtualize ->data_bestfree_p [31/34] xfs: devirtualize ->data_get_ftype and ->data_put_ftype [32/34] xfs: remove the now unused dir ops infrastructure [33/34] xfs: merge xfs_dir2_data_freescan and xfs_dir2_data_freescan_int [34/34] xfs: always pass a valid hdr to xfs_dir3_leaf_check_int

Message ID

20191101220719.29100-9-hch@lst.de (mailing list archive)

State

Superseded, archived

Headers

From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 08/34] xfs: devirtualize ->leaf_hdr_to_disk
Date: Fri,  1 Nov 2019 15:06:53 -0700
Message-Id: <20191101220719.29100-9-hch@lst.de>
In-Reply-To: <20191101220719.29100-1-hch@lst.de>
References: <20191101220719.29100-1-hch@lst.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-xfs-owner@vger.kernel.org
Precedence: bulk

Series

[01/34] xfs: move incore structures out of xfs_da_format.h | expand

Commit Message

Christoph Hellwig Nov. 1, 2019, 10:06 p.m. UTC

Replace the ->leaf_hdr_to_disk dir ops method with a directly called
xfs_dir_leaf_hdr_to_disk helper that takes care of the differences
between the v4 and v5 on-disk format.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/libxfs/xfs_da_format.c | 35 -------------------------------
 fs/xfs/libxfs/xfs_dir2.h      |  2 --
 fs/xfs/libxfs/xfs_dir2_leaf.c | 39 ++++++++++++++++++++++++++++++-----
 fs/xfs/libxfs/xfs_dir2_node.c | 12 +++++------
 fs/xfs/libxfs/xfs_dir2_priv.h |  2 ++
 5 files changed, 42 insertions(+), 48 deletions(-)

Comments

Darrick J. Wong Nov. 4, 2019, 8 p.m. UTC | #1

On Fri, Nov 01, 2019 at 03:06:53PM -0700, Christoph Hellwig wrote:
> Replace the ->leaf_hdr_to_disk dir ops method with a directly called
> xfs_dir_leaf_hdr_to_disk helper that takes care of the differences
> between the v4 and v5 on-disk format.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  fs/xfs/libxfs/xfs_da_format.c | 35 -------------------------------
>  fs/xfs/libxfs/xfs_dir2.h      |  2 --
>  fs/xfs/libxfs/xfs_dir2_leaf.c | 39 ++++++++++++++++++++++++++++++-----
>  fs/xfs/libxfs/xfs_dir2_node.c | 12 +++++------
>  fs/xfs/libxfs/xfs_dir2_priv.h |  2 ++
>  5 files changed, 42 insertions(+), 48 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
> index c848cab41be5..193708d12459 100644
> --- a/fs/xfs/libxfs/xfs_da_format.c
> +++ b/fs/xfs/libxfs/xfs_da_format.c
> @@ -430,38 +430,6 @@ xfs_dir3_leaf_ents_p(struct xfs_dir2_leaf *lp)
>  	return ((struct xfs_dir3_leaf *)lp)->__ents;
>  }
>  
> -static void
> -xfs_dir2_leaf_hdr_to_disk(
> -	struct xfs_dir2_leaf		*to,
> -	struct xfs_dir3_icleaf_hdr	*from)
> -{
> -	ASSERT(from->magic == XFS_DIR2_LEAF1_MAGIC ||
> -	       from->magic == XFS_DIR2_LEAFN_MAGIC);
> -
> -	to->hdr.info.forw = cpu_to_be32(from->forw);
> -	to->hdr.info.back = cpu_to_be32(from->back);
> -	to->hdr.info.magic = cpu_to_be16(from->magic);
> -	to->hdr.count = cpu_to_be16(from->count);
> -	to->hdr.stale = cpu_to_be16(from->stale);
> -}
> -
> -static void
> -xfs_dir3_leaf_hdr_to_disk(
> -	struct xfs_dir2_leaf		*to,
> -	struct xfs_dir3_icleaf_hdr	*from)
> -{
> -	struct xfs_dir3_leaf_hdr *hdr3 = (struct xfs_dir3_leaf_hdr *)to;
> -
> -	ASSERT(from->magic == XFS_DIR3_LEAF1_MAGIC ||
> -	       from->magic == XFS_DIR3_LEAFN_MAGIC);
> -
> -	hdr3->info.hdr.forw = cpu_to_be32(from->forw);
> -	hdr3->info.hdr.back = cpu_to_be32(from->back);
> -	hdr3->info.hdr.magic = cpu_to_be16(from->magic);
> -	hdr3->count = cpu_to_be16(from->count);
> -	hdr3->stale = cpu_to_be16(from->stale);
> -}
> -
>  /*
>   * Directory free space block operations
>   */
> @@ -615,7 +583,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = {
>  	.data_unused_p = xfs_dir2_data_unused_p,
>  
>  	.leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr),
> -	.leaf_hdr_to_disk = xfs_dir2_leaf_hdr_to_disk,
>  	.leaf_max_ents = xfs_dir2_max_leaf_ents,
>  	.leaf_ents_p = xfs_dir2_leaf_ents_p,
>  
> @@ -659,7 +626,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
>  	.data_unused_p = xfs_dir2_data_unused_p,
>  
>  	.leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr),
> -	.leaf_hdr_to_disk = xfs_dir2_leaf_hdr_to_disk,
>  	.leaf_max_ents = xfs_dir2_max_leaf_ents,
>  	.leaf_ents_p = xfs_dir2_leaf_ents_p,
>  
> @@ -703,7 +669,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = {
>  	.data_unused_p = xfs_dir3_data_unused_p,
>  
>  	.leaf_hdr_size = sizeof(struct xfs_dir3_leaf_hdr),
> -	.leaf_hdr_to_disk = xfs_dir3_leaf_hdr_to_disk,
>  	.leaf_max_ents = xfs_dir3_max_leaf_ents,
>  	.leaf_ents_p = xfs_dir3_leaf_ents_p,
>  
> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
> index 74c592496bf0..15a1a72dc126 100644
> --- a/fs/xfs/libxfs/xfs_dir2.h
> +++ b/fs/xfs/libxfs/xfs_dir2.h
> @@ -73,8 +73,6 @@ struct xfs_dir_ops {
>  		(*data_unused_p)(struct xfs_dir2_data_hdr *hdr);
>  
>  	int	leaf_hdr_size;
> -	void	(*leaf_hdr_to_disk)(struct xfs_dir2_leaf *to,
> -				    struct xfs_dir3_icleaf_hdr *from);
>  	int	(*leaf_max_ents)(struct xfs_da_geometry *geo);
>  	struct xfs_dir2_leaf_entry *
>  		(*leaf_ents_p)(struct xfs_dir2_leaf *lp);
> diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c
> index 137ffd0a538b..56aae0b4cf89 100644
> --- a/fs/xfs/libxfs/xfs_dir2_leaf.c
> +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c
> @@ -59,6 +59,35 @@ xfs_dir2_leaf_hdr_from_disk(
>  	}
>  }
>  
> +void
> +xfs_dir2_leaf_hdr_to_disk(
> +	struct xfs_mount		*mp,
> +	struct xfs_dir2_leaf		*to,
> +	struct xfs_dir3_icleaf_hdr	*from)
> +{
> +	if (xfs_sb_version_hascrc(&mp->m_sb)) {
> +		struct xfs_dir3_leaf *to3 = (struct xfs_dir3_leaf *)to;
> +
> +		ASSERT(from->magic == XFS_DIR3_LEAF1_MAGIC ||
> +		       from->magic == XFS_DIR3_LEAFN_MAGIC);
> +
> +		to3->hdr.info.hdr.forw = cpu_to_be32(from->forw);
> +		to3->hdr.info.hdr.back = cpu_to_be32(from->back);
> +		to3->hdr.info.hdr.magic = cpu_to_be16(from->magic);
> +		to3->hdr.count = cpu_to_be16(from->count);
> +		to3->hdr.stale = cpu_to_be16(from->stale);
> +	} else {
> +		ASSERT(from->magic == XFS_DIR2_LEAF1_MAGIC ||
> +		       from->magic == XFS_DIR2_LEAFN_MAGIC);
> +
> +		to->hdr.info.forw = cpu_to_be32(from->forw);
> +		to->hdr.info.back = cpu_to_be32(from->back);
> +		to->hdr.info.magic = cpu_to_be16(from->magic);
> +		to->hdr.count = cpu_to_be16(from->count);
> +		to->hdr.stale = cpu_to_be16(from->stale);
> +	}
> +}
> +
>  /*
>   * Check the internal consistency of a leaf1 block.
>   * Pop an assert if something is wrong.
> @@ -413,7 +442,7 @@ xfs_dir2_block_to_leaf(
>  	xfs_dir2_leaf_hdr_from_disk(dp->i_mount, &leafhdr, leaf);
>  	leafhdr.count = be32_to_cpu(btp->count);
>  	leafhdr.stale = be32_to_cpu(btp->stale);
> -	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
> +	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, &leafhdr);
>  	xfs_dir3_leaf_log_header(args, lbp);
>  
>  	/*
> @@ -881,7 +910,7 @@ xfs_dir2_leaf_addname(
>  	/*
>  	 * Log the leaf fields and give up the buffers.
>  	 */
> -	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
> +	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, &leafhdr);
>  	xfs_dir3_leaf_log_header(args, lbp);
>  	xfs_dir3_leaf_log_ents(args, lbp, lfloglow, lfloghigh);
>  	xfs_dir3_leaf_check(dp, lbp);
> @@ -934,7 +963,7 @@ xfs_dir3_leaf_compact(
>  	leafhdr->count -= leafhdr->stale;
>  	leafhdr->stale = 0;
>  
> -	dp->d_ops->leaf_hdr_to_disk(leaf, leafhdr);
> +	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, leafhdr);
>  	xfs_dir3_leaf_log_header(args, bp);
>  	if (loglow != -1)
>  		xfs_dir3_leaf_log_ents(args, bp, loglow, to - 1);
> @@ -1384,7 +1413,7 @@ xfs_dir2_leaf_removename(
>  	 * We just mark the leaf entry stale by putting a null in it.
>  	 */
>  	leafhdr.stale++;
> -	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
> +	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, &leafhdr);
>  	xfs_dir3_leaf_log_header(args, lbp);
>  
>  	lep->address = cpu_to_be32(XFS_DIR2_NULL_DATAPTR);
> @@ -1775,7 +1804,7 @@ xfs_dir2_node_to_leaf(
>  	memcpy(xfs_dir2_leaf_bests_p(ltp), dp->d_ops->free_bests_p(free),
>  		freehdr.nvalid * sizeof(xfs_dir2_data_off_t));
>  
> -	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
> +	xfs_dir2_leaf_hdr_to_disk(mp, leaf, &leafhdr);
>  	xfs_dir3_leaf_log_header(args, lbp);
>  	xfs_dir3_leaf_log_bests(args, lbp, 0, be32_to_cpu(ltp->bestcount) - 1);
>  	xfs_dir3_leaf_log_tail(args, lbp);
> diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
> index 736a3ea2b92c..207ef9b4fe50 100644
> --- a/fs/xfs/libxfs/xfs_dir2_node.c
> +++ b/fs/xfs/libxfs/xfs_dir2_node.c
> @@ -493,7 +493,7 @@ xfs_dir2_leafn_add(
>  	lep->address = cpu_to_be32(xfs_dir2_db_off_to_dataptr(args->geo,
>  				args->blkno, args->index));
>  
> -	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
> +	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, &leafhdr);
>  	xfs_dir3_leaf_log_header(args, bp);
>  	xfs_dir3_leaf_log_ents(args, bp, lfloglow, lfloghigh);
>  	xfs_dir3_leaf_check(dp, bp);
> @@ -1073,8 +1073,8 @@ xfs_dir2_leafn_rebalance(
>  	ASSERT(hdr1.stale + hdr2.stale == oldstale);
>  
>  	/* log the changes made when moving the entries */
> -	dp->d_ops->leaf_hdr_to_disk(leaf1, &hdr1);
> -	dp->d_ops->leaf_hdr_to_disk(leaf2, &hdr2);
> +	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf1, &hdr1);
> +	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf2, &hdr2);
>  	xfs_dir3_leaf_log_header(args, blk1->bp);
>  	xfs_dir3_leaf_log_header(args, blk2->bp);
>  
> @@ -1243,7 +1243,7 @@ xfs_dir2_leafn_remove(
>  	 * Log the leaf block changes.
>  	 */
>  	leafhdr.stale++;
> -	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
> +	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, &leafhdr);
>  	xfs_dir3_leaf_log_header(args, bp);
>  
>  	lep->address = cpu_to_be32(XFS_DIR2_NULL_DATAPTR);
> @@ -1599,8 +1599,8 @@ xfs_dir2_leafn_unbalance(
>  	save_blk->hashval = be32_to_cpu(sents[savehdr.count - 1].hashval);
>  
>  	/* log the changes made when moving the entries */
> -	dp->d_ops->leaf_hdr_to_disk(save_leaf, &savehdr);
> -	dp->d_ops->leaf_hdr_to_disk(drop_leaf, &drophdr);
> +	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, save_leaf, &savehdr);
> +	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, drop_leaf, &drophdr);
>  	xfs_dir3_leaf_log_header(args, save_blk->bp);
>  	xfs_dir3_leaf_log_header(args, drop_blk->bp);
>  
> diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h
> index 434bb60c718c..b402a2391f49 100644
> --- a/fs/xfs/libxfs/xfs_dir2_priv.h
> +++ b/fs/xfs/libxfs/xfs_dir2_priv.h
> @@ -69,6 +69,8 @@ extern int xfs_dir3_data_init(struct xfs_da_args *args, xfs_dir2_db_t blkno,
>  /* xfs_dir2_leaf.c */
>  void xfs_dir2_leaf_hdr_from_disk(struct xfs_mount *mp,
>  		struct xfs_dir3_icleaf_hdr *to, struct xfs_dir2_leaf *from);
> +void xfs_dir2_leaf_hdr_to_disk(struct xfs_mount *mp, struct xfs_dir2_leaf *to,
> +		struct xfs_dir3_icleaf_hdr *from);
>  extern int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp,
>  		xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp);
>  extern int xfs_dir3_leafn_read(struct xfs_trans *tp, struct xfs_inode *dp,
> -- 
> 2.20.1
>

diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
index c848cab41be5..193708d12459 100644
--- a/fs/xfs/libxfs/xfs_da_format.c
+++ b/fs/xfs/libxfs/xfs_da_format.c
@@ -430,38 +430,6 @@  xfs_dir3_leaf_ents_p(struct xfs_dir2_leaf *lp)
 	return ((struct xfs_dir3_leaf *)lp)->__ents;
 }
 
-static void
-xfs_dir2_leaf_hdr_to_disk(
-	struct xfs_dir2_leaf		*to,
-	struct xfs_dir3_icleaf_hdr	*from)
-{
-	ASSERT(from->magic == XFS_DIR2_LEAF1_MAGIC ||
-	       from->magic == XFS_DIR2_LEAFN_MAGIC);
-
-	to->hdr.info.forw = cpu_to_be32(from->forw);
-	to->hdr.info.back = cpu_to_be32(from->back);
-	to->hdr.info.magic = cpu_to_be16(from->magic);
-	to->hdr.count = cpu_to_be16(from->count);
-	to->hdr.stale = cpu_to_be16(from->stale);
-}
-
-static void
-xfs_dir3_leaf_hdr_to_disk(
-	struct xfs_dir2_leaf		*to,
-	struct xfs_dir3_icleaf_hdr	*from)
-{
-	struct xfs_dir3_leaf_hdr *hdr3 = (struct xfs_dir3_leaf_hdr *)to;
-
-	ASSERT(from->magic == XFS_DIR3_LEAF1_MAGIC ||
-	       from->magic == XFS_DIR3_LEAFN_MAGIC);
-
-	hdr3->info.hdr.forw = cpu_to_be32(from->forw);
-	hdr3->info.hdr.back = cpu_to_be32(from->back);
-	hdr3->info.hdr.magic = cpu_to_be16(from->magic);
-	hdr3->count = cpu_to_be16(from->count);
-	hdr3->stale = cpu_to_be16(from->stale);
-}
-
 /*
  * Directory free space block operations
  */
@@ -615,7 +583,6 @@  static const struct xfs_dir_ops xfs_dir2_ops = {
 	.data_unused_p = xfs_dir2_data_unused_p,
 
 	.leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr),
-	.leaf_hdr_to_disk = xfs_dir2_leaf_hdr_to_disk,
 	.leaf_max_ents = xfs_dir2_max_leaf_ents,
 	.leaf_ents_p = xfs_dir2_leaf_ents_p,
 
@@ -659,7 +626,6 @@  static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
 	.data_unused_p = xfs_dir2_data_unused_p,
 
 	.leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr),
-	.leaf_hdr_to_disk = xfs_dir2_leaf_hdr_to_disk,
 	.leaf_max_ents = xfs_dir2_max_leaf_ents,
 	.leaf_ents_p = xfs_dir2_leaf_ents_p,
 
@@ -703,7 +669,6 @@  static const struct xfs_dir_ops xfs_dir3_ops = {
 	.data_unused_p = xfs_dir3_data_unused_p,
 
 	.leaf_hdr_size = sizeof(struct xfs_dir3_leaf_hdr),
-	.leaf_hdr_to_disk = xfs_dir3_leaf_hdr_to_disk,
 	.leaf_max_ents = xfs_dir3_max_leaf_ents,
 	.leaf_ents_p = xfs_dir3_leaf_ents_p,
 
diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
index 74c592496bf0..15a1a72dc126 100644
--- a/fs/xfs/libxfs/xfs_dir2.h
+++ b/fs/xfs/libxfs/xfs_dir2.h
@@ -73,8 +73,6 @@  struct xfs_dir_ops {
 		(*data_unused_p)(struct xfs_dir2_data_hdr *hdr);
 
 	int	leaf_hdr_size;
-	void	(*leaf_hdr_to_disk)(struct xfs_dir2_leaf *to,
-				    struct xfs_dir3_icleaf_hdr *from);
 	int	(*leaf_max_ents)(struct xfs_da_geometry *geo);
 	struct xfs_dir2_leaf_entry *
 		(*leaf_ents_p)(struct xfs_dir2_leaf *lp);
diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c
index 137ffd0a538b..56aae0b4cf89 100644
--- a/fs/xfs/libxfs/xfs_dir2_leaf.c
+++ b/fs/xfs/libxfs/xfs_dir2_leaf.c
@@ -59,6 +59,35 @@  xfs_dir2_leaf_hdr_from_disk(
 	}
 }
 
+void
+xfs_dir2_leaf_hdr_to_disk(
+	struct xfs_mount		*mp,
+	struct xfs_dir2_leaf		*to,
+	struct xfs_dir3_icleaf_hdr	*from)
+{
+	if (xfs_sb_version_hascrc(&mp->m_sb)) {
+		struct xfs_dir3_leaf *to3 = (struct xfs_dir3_leaf *)to;
+
+		ASSERT(from->magic == XFS_DIR3_LEAF1_MAGIC ||
+		       from->magic == XFS_DIR3_LEAFN_MAGIC);
+
+		to3->hdr.info.hdr.forw = cpu_to_be32(from->forw);
+		to3->hdr.info.hdr.back = cpu_to_be32(from->back);
+		to3->hdr.info.hdr.magic = cpu_to_be16(from->magic);
+		to3->hdr.count = cpu_to_be16(from->count);
+		to3->hdr.stale = cpu_to_be16(from->stale);
+	} else {
+		ASSERT(from->magic == XFS_DIR2_LEAF1_MAGIC ||
+		       from->magic == XFS_DIR2_LEAFN_MAGIC);
+
+		to->hdr.info.forw = cpu_to_be32(from->forw);
+		to->hdr.info.back = cpu_to_be32(from->back);
+		to->hdr.info.magic = cpu_to_be16(from->magic);
+		to->hdr.count = cpu_to_be16(from->count);
+		to->hdr.stale = cpu_to_be16(from->stale);
+	}
+}
+
 /*
  * Check the internal consistency of a leaf1 block.
  * Pop an assert if something is wrong.
@@ -413,7 +442,7 @@  xfs_dir2_block_to_leaf(
 	xfs_dir2_leaf_hdr_from_disk(dp->i_mount, &leafhdr, leaf);
 	leafhdr.count = be32_to_cpu(btp->count);
 	leafhdr.stale = be32_to_cpu(btp->stale);
-	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
+	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, &leafhdr);
 	xfs_dir3_leaf_log_header(args, lbp);
 
 	/*
@@ -881,7 +910,7 @@  xfs_dir2_leaf_addname(
 	/*
 	 * Log the leaf fields and give up the buffers.
 	 */
-	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
+	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, &leafhdr);
 	xfs_dir3_leaf_log_header(args, lbp);
 	xfs_dir3_leaf_log_ents(args, lbp, lfloglow, lfloghigh);
 	xfs_dir3_leaf_check(dp, lbp);
@@ -934,7 +963,7 @@  xfs_dir3_leaf_compact(
 	leafhdr->count -= leafhdr->stale;
 	leafhdr->stale = 0;
 
-	dp->d_ops->leaf_hdr_to_disk(leaf, leafhdr);
+	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, leafhdr);
 	xfs_dir3_leaf_log_header(args, bp);
 	if (loglow != -1)
 		xfs_dir3_leaf_log_ents(args, bp, loglow, to - 1);
@@ -1384,7 +1413,7 @@  xfs_dir2_leaf_removename(
 	 * We just mark the leaf entry stale by putting a null in it.
 	 */
 	leafhdr.stale++;
-	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
+	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, &leafhdr);
 	xfs_dir3_leaf_log_header(args, lbp);
 
 	lep->address = cpu_to_be32(XFS_DIR2_NULL_DATAPTR);
@@ -1775,7 +1804,7 @@  xfs_dir2_node_to_leaf(
 	memcpy(xfs_dir2_leaf_bests_p(ltp), dp->d_ops->free_bests_p(free),
 		freehdr.nvalid * sizeof(xfs_dir2_data_off_t));
 
-	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
+	xfs_dir2_leaf_hdr_to_disk(mp, leaf, &leafhdr);
 	xfs_dir3_leaf_log_header(args, lbp);
 	xfs_dir3_leaf_log_bests(args, lbp, 0, be32_to_cpu(ltp->bestcount) - 1);
 	xfs_dir3_leaf_log_tail(args, lbp);
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
index 736a3ea2b92c..207ef9b4fe50 100644
--- a/fs/xfs/libxfs/xfs_dir2_node.c
+++ b/fs/xfs/libxfs/xfs_dir2_node.c
@@ -493,7 +493,7 @@  xfs_dir2_leafn_add(
 	lep->address = cpu_to_be32(xfs_dir2_db_off_to_dataptr(args->geo,
 				args->blkno, args->index));
 
-	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
+	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, &leafhdr);
 	xfs_dir3_leaf_log_header(args, bp);
 	xfs_dir3_leaf_log_ents(args, bp, lfloglow, lfloghigh);
 	xfs_dir3_leaf_check(dp, bp);
@@ -1073,8 +1073,8 @@  xfs_dir2_leafn_rebalance(
 	ASSERT(hdr1.stale + hdr2.stale == oldstale);
 
 	/* log the changes made when moving the entries */
-	dp->d_ops->leaf_hdr_to_disk(leaf1, &hdr1);
-	dp->d_ops->leaf_hdr_to_disk(leaf2, &hdr2);
+	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf1, &hdr1);
+	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf2, &hdr2);
 	xfs_dir3_leaf_log_header(args, blk1->bp);
 	xfs_dir3_leaf_log_header(args, blk2->bp);
 
@@ -1243,7 +1243,7 @@  xfs_dir2_leafn_remove(
 	 * Log the leaf block changes.
 	 */
 	leafhdr.stale++;
-	dp->d_ops->leaf_hdr_to_disk(leaf, &leafhdr);
+	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, leaf, &leafhdr);
 	xfs_dir3_leaf_log_header(args, bp);
 
 	lep->address = cpu_to_be32(XFS_DIR2_NULL_DATAPTR);
@@ -1599,8 +1599,8 @@  xfs_dir2_leafn_unbalance(
 	save_blk->hashval = be32_to_cpu(sents[savehdr.count - 1].hashval);
 
 	/* log the changes made when moving the entries */
-	dp->d_ops->leaf_hdr_to_disk(save_leaf, &savehdr);
-	dp->d_ops->leaf_hdr_to_disk(drop_leaf, &drophdr);
+	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, save_leaf, &savehdr);
+	xfs_dir2_leaf_hdr_to_disk(dp->i_mount, drop_leaf, &drophdr);
 	xfs_dir3_leaf_log_header(args, save_blk->bp);
 	xfs_dir3_leaf_log_header(args, drop_blk->bp);
 
diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h
index 434bb60c718c..b402a2391f49 100644
--- a/fs/xfs/libxfs/xfs_dir2_priv.h
+++ b/fs/xfs/libxfs/xfs_dir2_priv.h
@@ -69,6 +69,8 @@  extern int xfs_dir3_data_init(struct xfs_da_args *args, xfs_dir2_db_t blkno,
 /* xfs_dir2_leaf.c */
 void xfs_dir2_leaf_hdr_from_disk(struct xfs_mount *mp,
 		struct xfs_dir3_icleaf_hdr *to, struct xfs_dir2_leaf *from);
+void xfs_dir2_leaf_hdr_to_disk(struct xfs_mount *mp, struct xfs_dir2_leaf *to,
+		struct xfs_dir3_icleaf_hdr *from);
 extern int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp,
 		xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp);
 extern int xfs_dir3_leafn_read(struct xfs_trans *tp, struct xfs_inode *dp,

[08/34] xfs: devirtualize ->leaf_hdr_to_disk

Commit Message

Comments

Patch