[18/34] xfs: devirtualize ->db_to_fdb and ->db_to_fdindex

Message ID	20191101220719.29100-19-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 18/34] xfs: devirtualize ->db_to_fdb and ->db_to_fdindex Date: Fri, 1 Nov 2019 15:07:03 -0700 Message-Id: <20191101220719.29100-19-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-19-hch@lst.de (mailing list archive)

State

Superseded, archived

Headers

From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 18/34] xfs: devirtualize ->db_to_fdb and ->db_to_fdindex
Date: Fri,  1 Nov 2019 15:07:03 -0700
Message-Id: <20191101220719.29100-19-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:07 p.m. UTC

Now that the max bests value is in struct xfs_da_geometry both instances
of ->db_to_fdb and ->db_to_fdindex are identical.  Replace them with
local xfs_dir2_db_to_fdb and xfs_dir2_db_to_fdindex functions in
xfs_dir2_node.c.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/libxfs/xfs_da_format.c | 47 -----------------------------------
 fs/xfs/libxfs/xfs_dir2.h      |  5 ----
 fs/xfs/libxfs/xfs_dir2_node.c | 35 ++++++++++++++++++++------
 3 files changed, 27 insertions(+), 60 deletions(-)

Comments

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

On Fri, Nov 01, 2019 at 03:07:03PM -0700, Christoph Hellwig wrote:
> Now that the max bests value is in struct xfs_da_geometry both instances
> of ->db_to_fdb and ->db_to_fdindex are identical.  Replace them with
> local xfs_dir2_db_to_fdb and xfs_dir2_db_to_fdindex functions in
> xfs_dir2_node.c.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Seems pretty straightforward,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  fs/xfs/libxfs/xfs_da_format.c | 47 -----------------------------------
>  fs/xfs/libxfs/xfs_dir2.h      |  5 ----
>  fs/xfs/libxfs/xfs_dir2_node.c | 35 ++++++++++++++++++++------
>  3 files changed, 27 insertions(+), 60 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
> index d2d3144c1598..2b708b9fae1a 100644
> --- a/fs/xfs/libxfs/xfs_da_format.c
> +++ b/fs/xfs/libxfs/xfs_da_format.c
> @@ -400,44 +400,6 @@ xfs_dir3_data_unused_p(struct xfs_dir2_data_hdr *hdr)
>  		((char *)hdr + sizeof(struct xfs_dir3_data_hdr));
>  }
>  
> -/*
> - * Convert data space db to the corresponding free db.
> - */
> -static xfs_dir2_db_t
> -xfs_dir2_db_to_fdb(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
> -{
> -	return xfs_dir2_byte_to_db(geo, XFS_DIR2_FREE_OFFSET) +
> -			(db / geo->free_max_bests);
> -}
> -
> -/*
> - * Convert data space db to the corresponding index in a free db.
> - */
> -static int
> -xfs_dir2_db_to_fdindex(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
> -{
> -	return db % geo->free_max_bests;
> -}
> -
> -/*
> - * Convert data space db to the corresponding free db.
> - */
> -static xfs_dir2_db_t
> -xfs_dir3_db_to_fdb(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
> -{
> -	return xfs_dir2_byte_to_db(geo, XFS_DIR2_FREE_OFFSET) +
> -			(db / geo->free_max_bests);
> -}
> -
> -/*
> - * Convert data space db to the corresponding index in a free db.
> - */
> -static int
> -xfs_dir3_db_to_fdindex(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
> -{
> -	return db % geo->free_max_bests;
> -}
> -
>  static const struct xfs_dir_ops xfs_dir2_ops = {
>  	.sf_entsize = xfs_dir2_sf_entsize,
>  	.sf_nextentry = xfs_dir2_sf_nextentry,
> @@ -467,9 +429,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = {
>  	.data_first_entry_p = xfs_dir2_data_first_entry_p,
>  	.data_entry_p = xfs_dir2_data_entry_p,
>  	.data_unused_p = xfs_dir2_data_unused_p,
> -
> -	.db_to_fdb = xfs_dir2_db_to_fdb,
> -	.db_to_fdindex = xfs_dir2_db_to_fdindex,
>  };
>  
>  static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
> @@ -501,9 +460,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
>  	.data_first_entry_p = xfs_dir2_ftype_data_first_entry_p,
>  	.data_entry_p = xfs_dir2_data_entry_p,
>  	.data_unused_p = xfs_dir2_data_unused_p,
> -
> -	.db_to_fdb = xfs_dir2_db_to_fdb,
> -	.db_to_fdindex = xfs_dir2_db_to_fdindex,
>  };
>  
>  static const struct xfs_dir_ops xfs_dir3_ops = {
> @@ -535,9 +491,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = {
>  	.data_first_entry_p = xfs_dir3_data_first_entry_p,
>  	.data_entry_p = xfs_dir3_data_entry_p,
>  	.data_unused_p = xfs_dir3_data_unused_p,
> -
> -	.db_to_fdb = xfs_dir3_db_to_fdb,
> -	.db_to_fdindex = xfs_dir3_db_to_fdindex,
>  };
>  
>  /*
> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
> index e3c1385d1522..e302679d8c80 100644
> --- a/fs/xfs/libxfs/xfs_dir2.h
> +++ b/fs/xfs/libxfs/xfs_dir2.h
> @@ -71,11 +71,6 @@ struct xfs_dir_ops {
>  		(*data_entry_p)(struct xfs_dir2_data_hdr *hdr);
>  	struct xfs_dir2_data_unused *
>  		(*data_unused_p)(struct xfs_dir2_data_hdr *hdr);
> -
> -	xfs_dir2_db_t (*db_to_fdb)(struct xfs_da_geometry *geo,
> -				   xfs_dir2_db_t db);
> -	int	(*db_to_fdindex)(struct xfs_da_geometry *geo,
> -				 xfs_dir2_db_t db);
>  };
>  
>  extern const struct xfs_dir_ops *
> diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
> index 0fcd7351038e..ceb5936b58dd 100644
> --- a/fs/xfs/libxfs/xfs_dir2_node.c
> +++ b/fs/xfs/libxfs/xfs_dir2_node.c
> @@ -33,6 +33,25 @@ static int xfs_dir2_leafn_remove(xfs_da_args_t *args, struct xfs_buf *bp,
>  				 int index, xfs_da_state_blk_t *dblk,
>  				 int *rval);
>  
> +/*
> + * Convert data space db to the corresponding free db.
> + */
> +static xfs_dir2_db_t
> +xfs_dir2_db_to_fdb(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
> +{
> +	return xfs_dir2_byte_to_db(geo, XFS_DIR2_FREE_OFFSET) +
> +			(db / geo->free_max_bests);
> +}
> +
> +/*
> + * Convert data space db to the corresponding index in a free db.
> + */
> +static int
> +xfs_dir2_db_to_fdindex(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
> +{
> +	return db % geo->free_max_bests;
> +}
> +
>  /*
>   * Check internal consistency of a leafn block.
>   */
> @@ -676,7 +695,7 @@ xfs_dir2_leafn_lookup_for_addname(
>  			 * Convert the data block to the free block
>  			 * holding its freespace information.
>  			 */
> -			newfdb = dp->d_ops->db_to_fdb(args->geo, newdb);
> +			newfdb = xfs_dir2_db_to_fdb(args->geo, newdb);
>  			/*
>  			 * If it's not the one we have in hand, read it in.
>  			 */
> @@ -700,7 +719,7 @@ xfs_dir2_leafn_lookup_for_addname(
>  			/*
>  			 * Get the index for our entry.
>  			 */
> -			fi = dp->d_ops->db_to_fdindex(args->geo, curdb);
> +			fi = xfs_dir2_db_to_fdindex(args->geo, curdb);
>  			/*
>  			 * If it has room, return it.
>  			 */
> @@ -1320,7 +1339,7 @@ xfs_dir2_leafn_remove(
>  		 * Convert the data block number to a free block,
>  		 * read in the free block.
>  		 */
> -		fdb = dp->d_ops->db_to_fdb(args->geo, db);
> +		fdb = xfs_dir2_db_to_fdb(args->geo, db);
>  		error = xfs_dir2_free_read(tp, dp,
>  					   xfs_dir2_db_to_da(args->geo, fdb),
>  					   &fbp);
> @@ -1340,7 +1359,7 @@ xfs_dir2_leafn_remove(
>  		/*
>  		 * Calculate which entry we need to fix.
>  		 */
> -		findex = dp->d_ops->db_to_fdindex(args->geo, db);
> +		findex = xfs_dir2_db_to_fdindex(args->geo, db);
>  		longest = be16_to_cpu(bf[0].length);
>  		/*
>  		 * If the data block is now empty we can get rid of it
> @@ -1683,7 +1702,7 @@ xfs_dir2_node_add_datablk(
>  	 * Get the freespace block corresponding to the data block
>  	 * that was just allocated.
>  	 */
> -	fbno = dp->d_ops->db_to_fdb(args->geo, *dbno);
> +	fbno = xfs_dir2_db_to_fdb(args->geo, *dbno);
>  	error = xfs_dir2_free_try_read(tp, dp,
>  			       xfs_dir2_db_to_da(args->geo, fbno), &fbp);
>  	if (error)
> @@ -1698,11 +1717,11 @@ xfs_dir2_node_add_datablk(
>  		if (error)
>  			return error;
>  
> -		if (dp->d_ops->db_to_fdb(args->geo, *dbno) != fbno) {
> +		if (xfs_dir2_db_to_fdb(args->geo, *dbno) != fbno) {
>  			xfs_alert(mp,
>  "%s: dir ino %llu needed freesp block %lld for data block %lld, got %lld",
>  				__func__, (unsigned long long)dp->i_ino,
> -				(long long)dp->d_ops->db_to_fdb(args->geo, *dbno),
> +				(long long)xfs_dir2_db_to_fdb(args->geo, *dbno),
>  				(long long)*dbno, (long long)fbno);
>  			if (fblk) {
>  				xfs_alert(mp,
> @@ -1731,7 +1750,7 @@ xfs_dir2_node_add_datablk(
>  	}
>  
>  	/* Set the freespace block index from the data block number. */
> -	*findex = dp->d_ops->db_to_fdindex(args->geo, *dbno);
> +	*findex = xfs_dir2_db_to_fdindex(args->geo, *dbno);
>  
>  	/* Extend the freespace table if the new data block is off the end. */
>  	if (*findex >= hdr->nvalid) {
> -- 
> 2.20.1
>

diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
index d2d3144c1598..2b708b9fae1a 100644
--- a/fs/xfs/libxfs/xfs_da_format.c
+++ b/fs/xfs/libxfs/xfs_da_format.c
@@ -400,44 +400,6 @@  xfs_dir3_data_unused_p(struct xfs_dir2_data_hdr *hdr)
 		((char *)hdr + sizeof(struct xfs_dir3_data_hdr));
 }
 
-/*
- * Convert data space db to the corresponding free db.
- */
-static xfs_dir2_db_t
-xfs_dir2_db_to_fdb(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
-{
-	return xfs_dir2_byte_to_db(geo, XFS_DIR2_FREE_OFFSET) +
-			(db / geo->free_max_bests);
-}
-
-/*
- * Convert data space db to the corresponding index in a free db.
- */
-static int
-xfs_dir2_db_to_fdindex(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
-{
-	return db % geo->free_max_bests;
-}
-
-/*
- * Convert data space db to the corresponding free db.
- */
-static xfs_dir2_db_t
-xfs_dir3_db_to_fdb(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
-{
-	return xfs_dir2_byte_to_db(geo, XFS_DIR2_FREE_OFFSET) +
-			(db / geo->free_max_bests);
-}
-
-/*
- * Convert data space db to the corresponding index in a free db.
- */
-static int
-xfs_dir3_db_to_fdindex(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
-{
-	return db % geo->free_max_bests;
-}
-
 static const struct xfs_dir_ops xfs_dir2_ops = {
 	.sf_entsize = xfs_dir2_sf_entsize,
 	.sf_nextentry = xfs_dir2_sf_nextentry,
@@ -467,9 +429,6 @@  static const struct xfs_dir_ops xfs_dir2_ops = {
 	.data_first_entry_p = xfs_dir2_data_first_entry_p,
 	.data_entry_p = xfs_dir2_data_entry_p,
 	.data_unused_p = xfs_dir2_data_unused_p,
-
-	.db_to_fdb = xfs_dir2_db_to_fdb,
-	.db_to_fdindex = xfs_dir2_db_to_fdindex,
 };
 
 static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
@@ -501,9 +460,6 @@  static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
 	.data_first_entry_p = xfs_dir2_ftype_data_first_entry_p,
 	.data_entry_p = xfs_dir2_data_entry_p,
 	.data_unused_p = xfs_dir2_data_unused_p,
-
-	.db_to_fdb = xfs_dir2_db_to_fdb,
-	.db_to_fdindex = xfs_dir2_db_to_fdindex,
 };
 
 static const struct xfs_dir_ops xfs_dir3_ops = {
@@ -535,9 +491,6 @@  static const struct xfs_dir_ops xfs_dir3_ops = {
 	.data_first_entry_p = xfs_dir3_data_first_entry_p,
 	.data_entry_p = xfs_dir3_data_entry_p,
 	.data_unused_p = xfs_dir3_data_unused_p,
-
-	.db_to_fdb = xfs_dir3_db_to_fdb,
-	.db_to_fdindex = xfs_dir3_db_to_fdindex,
 };
 
 /*
diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
index e3c1385d1522..e302679d8c80 100644
--- a/fs/xfs/libxfs/xfs_dir2.h
+++ b/fs/xfs/libxfs/xfs_dir2.h
@@ -71,11 +71,6 @@  struct xfs_dir_ops {
 		(*data_entry_p)(struct xfs_dir2_data_hdr *hdr);
 	struct xfs_dir2_data_unused *
 		(*data_unused_p)(struct xfs_dir2_data_hdr *hdr);
-
-	xfs_dir2_db_t (*db_to_fdb)(struct xfs_da_geometry *geo,
-				   xfs_dir2_db_t db);
-	int	(*db_to_fdindex)(struct xfs_da_geometry *geo,
-				 xfs_dir2_db_t db);
 };
 
 extern const struct xfs_dir_ops *
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
index 0fcd7351038e..ceb5936b58dd 100644
--- a/fs/xfs/libxfs/xfs_dir2_node.c
+++ b/fs/xfs/libxfs/xfs_dir2_node.c
@@ -33,6 +33,25 @@  static int xfs_dir2_leafn_remove(xfs_da_args_t *args, struct xfs_buf *bp,
 				 int index, xfs_da_state_blk_t *dblk,
 				 int *rval);
 
+/*
+ * Convert data space db to the corresponding free db.
+ */
+static xfs_dir2_db_t
+xfs_dir2_db_to_fdb(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
+{
+	return xfs_dir2_byte_to_db(geo, XFS_DIR2_FREE_OFFSET) +
+			(db / geo->free_max_bests);
+}
+
+/*
+ * Convert data space db to the corresponding index in a free db.
+ */
+static int
+xfs_dir2_db_to_fdindex(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
+{
+	return db % geo->free_max_bests;
+}
+
 /*
  * Check internal consistency of a leafn block.
  */
@@ -676,7 +695,7 @@  xfs_dir2_leafn_lookup_for_addname(
 			 * Convert the data block to the free block
 			 * holding its freespace information.
 			 */
-			newfdb = dp->d_ops->db_to_fdb(args->geo, newdb);
+			newfdb = xfs_dir2_db_to_fdb(args->geo, newdb);
 			/*
 			 * If it's not the one we have in hand, read it in.
 			 */
@@ -700,7 +719,7 @@  xfs_dir2_leafn_lookup_for_addname(
 			/*
 			 * Get the index for our entry.
 			 */
-			fi = dp->d_ops->db_to_fdindex(args->geo, curdb);
+			fi = xfs_dir2_db_to_fdindex(args->geo, curdb);
 			/*
 			 * If it has room, return it.
 			 */
@@ -1320,7 +1339,7 @@  xfs_dir2_leafn_remove(
 		 * Convert the data block number to a free block,
 		 * read in the free block.
 		 */
-		fdb = dp->d_ops->db_to_fdb(args->geo, db);
+		fdb = xfs_dir2_db_to_fdb(args->geo, db);
 		error = xfs_dir2_free_read(tp, dp,
 					   xfs_dir2_db_to_da(args->geo, fdb),
 					   &fbp);
@@ -1340,7 +1359,7 @@  xfs_dir2_leafn_remove(
 		/*
 		 * Calculate which entry we need to fix.
 		 */
-		findex = dp->d_ops->db_to_fdindex(args->geo, db);
+		findex = xfs_dir2_db_to_fdindex(args->geo, db);
 		longest = be16_to_cpu(bf[0].length);
 		/*
 		 * If the data block is now empty we can get rid of it
@@ -1683,7 +1702,7 @@  xfs_dir2_node_add_datablk(
 	 * Get the freespace block corresponding to the data block
 	 * that was just allocated.
 	 */
-	fbno = dp->d_ops->db_to_fdb(args->geo, *dbno);
+	fbno = xfs_dir2_db_to_fdb(args->geo, *dbno);
 	error = xfs_dir2_free_try_read(tp, dp,
 			       xfs_dir2_db_to_da(args->geo, fbno), &fbp);
 	if (error)
@@ -1698,11 +1717,11 @@  xfs_dir2_node_add_datablk(
 		if (error)
 			return error;
 
-		if (dp->d_ops->db_to_fdb(args->geo, *dbno) != fbno) {
+		if (xfs_dir2_db_to_fdb(args->geo, *dbno) != fbno) {
 			xfs_alert(mp,
 "%s: dir ino %llu needed freesp block %lld for data block %lld, got %lld",
 				__func__, (unsigned long long)dp->i_ino,
-				(long long)dp->d_ops->db_to_fdb(args->geo, *dbno),
+				(long long)xfs_dir2_db_to_fdb(args->geo, *dbno),
 				(long long)*dbno, (long long)fbno);
 			if (fblk) {
 				xfs_alert(mp,
@@ -1731,7 +1750,7 @@  xfs_dir2_node_add_datablk(
 	}
 
 	/* Set the freespace block index from the data block number. */
-	*findex = dp->d_ops->db_to_fdindex(args->geo, *dbno);
+	*findex = xfs_dir2_db_to_fdindex(args->geo, *dbno);
 
 	/* Extend the freespace table if the new data block is off the end. */
 	if (*findex >= hdr->nvalid) {

[18/34] xfs: devirtualize ->db_to_fdb and ->db_to_fdindex

Commit Message

Comments

Patch