From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 17/34] xfs: move the max dir2 free bests count to struct xfs_da_geometry
Date: Mon, 4 Nov 2019 12:23:07 -0800 [thread overview]
Message-ID: <20191104202307.GR4153244@magnolia> (raw)
In-Reply-To: <20191101220719.29100-18-hch@lst.de>
On Fri, Nov 01, 2019 at 03:07:02PM -0700, Christoph Hellwig wrote:
> Move the max free bests count towards our structure for dir/attr
> geometry parameters.
>
> 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_btree.h | 1 +
> fs/xfs/libxfs/xfs_da_format.c | 29 ++++-------------------------
> fs/xfs/libxfs/xfs_dir2.c | 2 ++
> fs/xfs/libxfs/xfs_dir2.h | 1 -
> fs/xfs/libxfs/xfs_dir2_node.c | 12 +++++-------
> 5 files changed, 12 insertions(+), 33 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h
> index 3d0b1e97bf43..e3f4329ab882 100644
> --- a/fs/xfs/libxfs/xfs_da_btree.h
> +++ b/fs/xfs/libxfs/xfs_da_btree.h
> @@ -30,6 +30,7 @@ struct xfs_da_geometry {
> unsigned int leaf_max_ents; /* # of entries in dir2 leaf */
> xfs_dablk_t leafblk; /* blockno of leaf data v2 */
> int free_hdr_size; /* dir2 free header size */
> + unsigned int free_max_bests; /* # of bests entries in dir2 free */
> xfs_dablk_t freeblk; /* blockno of free data v2 */
> };
>
> diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
> index 1fc8982c830f..d2d3144c1598 100644
> --- a/fs/xfs/libxfs/xfs_da_format.c
> +++ b/fs/xfs/libxfs/xfs_da_format.c
> @@ -400,17 +400,6 @@ xfs_dir3_data_unused_p(struct xfs_dir2_data_hdr *hdr)
> ((char *)hdr + sizeof(struct xfs_dir3_data_hdr));
> }
>
> -
> -/*
> - * Directory free space block operations
> - */
> -static int
> -xfs_dir2_free_max_bests(struct xfs_da_geometry *geo)
> -{
> - return (geo->blksize - sizeof(struct xfs_dir2_free_hdr)) /
> - sizeof(xfs_dir2_data_off_t);
> -}
> -
> /*
> * Convert data space db to the corresponding free db.
> */
> @@ -418,7 +407,7 @@ 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 / xfs_dir2_free_max_bests(geo));
> + (db / geo->free_max_bests);
> }
>
> /*
> @@ -427,14 +416,7 @@ xfs_dir2_db_to_fdb(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
> static int
> xfs_dir2_db_to_fdindex(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
> {
> - return db % xfs_dir2_free_max_bests(geo);
> -}
> -
> -static int
> -xfs_dir3_free_max_bests(struct xfs_da_geometry *geo)
> -{
> - return (geo->blksize - sizeof(struct xfs_dir3_free_hdr)) /
> - sizeof(xfs_dir2_data_off_t);
> + return db % geo->free_max_bests;
> }
>
> /*
> @@ -444,7 +426,7 @@ 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 / xfs_dir3_free_max_bests(geo));
> + (db / geo->free_max_bests);
> }
>
> /*
> @@ -453,7 +435,7 @@ xfs_dir3_db_to_fdb(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
> static int
> xfs_dir3_db_to_fdindex(struct xfs_da_geometry *geo, xfs_dir2_db_t db)
> {
> - return db % xfs_dir3_free_max_bests(geo);
> + return db % geo->free_max_bests;
> }
>
> static const struct xfs_dir_ops xfs_dir2_ops = {
> @@ -486,7 +468,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = {
> .data_entry_p = xfs_dir2_data_entry_p,
> .data_unused_p = xfs_dir2_data_unused_p,
>
> - .free_max_bests = xfs_dir2_free_max_bests,
> .db_to_fdb = xfs_dir2_db_to_fdb,
> .db_to_fdindex = xfs_dir2_db_to_fdindex,
> };
> @@ -521,7 +502,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
> .data_entry_p = xfs_dir2_data_entry_p,
> .data_unused_p = xfs_dir2_data_unused_p,
>
> - .free_max_bests = xfs_dir2_free_max_bests,
> .db_to_fdb = xfs_dir2_db_to_fdb,
> .db_to_fdindex = xfs_dir2_db_to_fdindex,
> };
> @@ -556,7 +536,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = {
> .data_entry_p = xfs_dir3_data_entry_p,
> .data_unused_p = xfs_dir3_data_unused_p,
>
> - .free_max_bests = xfs_dir3_free_max_bests,
> .db_to_fdb = xfs_dir3_db_to_fdb,
> .db_to_fdindex = xfs_dir3_db_to_fdindex,
> };
> diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c
> index 13ac228bfc86..6c46893af17e 100644
> --- a/fs/xfs/libxfs/xfs_dir2.c
> +++ b/fs/xfs/libxfs/xfs_dir2.c
> @@ -133,6 +133,8 @@ xfs_da_mount(
> }
> dageo->leaf_max_ents = (dageo->blksize - dageo->leaf_hdr_size) /
> sizeof(struct xfs_dir2_leaf_entry);
> + dageo->free_max_bests = (dageo->blksize - dageo->free_hdr_size) /
> + sizeof(xfs_dir2_data_off_t);
>
> /*
> * Now we've set up the block conversion variables, we can calculate the
> diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
> index d87cd71e3cf1..e3c1385d1522 100644
> --- a/fs/xfs/libxfs/xfs_dir2.h
> +++ b/fs/xfs/libxfs/xfs_dir2.h
> @@ -72,7 +72,6 @@ struct xfs_dir_ops {
> struct xfs_dir2_data_unused *
> (*data_unused_p)(struct xfs_dir2_data_hdr *hdr);
>
> - int (*free_max_bests)(struct xfs_da_geometry *geo);
> 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,
> diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
> index 7047d1e066f9..0fcd7351038e 100644
> --- a/fs/xfs/libxfs/xfs_dir2_node.c
> +++ b/fs/xfs/libxfs/xfs_dir2_node.c
> @@ -160,10 +160,9 @@ xfs_dir3_free_header_check(
> struct xfs_buf *bp)
> {
> struct xfs_mount *mp = dp->i_mount;
> + int maxbests = mp->m_dir_geo->free_max_bests;
> unsigned int firstdb;
> - int maxbests;
>
> - maxbests = dp->d_ops->free_max_bests(mp->m_dir_geo);
> firstdb = (xfs_dir2_da_to_db(mp->m_dir_geo, fbno) -
> xfs_dir2_byte_to_db(mp->m_dir_geo, XFS_DIR2_FREE_OFFSET)) *
> maxbests;
> @@ -558,8 +557,7 @@ xfs_dir2_free_hdr_check(
>
> xfs_dir2_free_hdr_from_disk(dp->i_mount, &hdr, bp->b_addr);
>
> - ASSERT((hdr.firstdb %
> - dp->d_ops->free_max_bests(dp->i_mount->m_dir_geo)) == 0);
> + ASSERT((hdr.firstdb % dp->i_mount->m_dir_geo->free_max_bests) == 0);
> ASSERT(hdr.firstdb <= db);
> ASSERT(db < hdr.firstdb + hdr.nvalid);
> }
> @@ -1334,7 +1332,7 @@ xfs_dir2_leafn_remove(
> struct xfs_dir3_icfree_hdr freehdr;
>
> xfs_dir2_free_hdr_from_disk(dp->i_mount, &freehdr, free);
> - ASSERT(freehdr.firstdb == dp->d_ops->free_max_bests(args->geo) *
> + ASSERT(freehdr.firstdb == args->geo->free_max_bests *
> (fdb - xfs_dir2_byte_to_db(args->geo,
> XFS_DIR2_FREE_OFFSET)));
> }
> @@ -1727,7 +1725,7 @@ xfs_dir2_node_add_datablk(
> /* Remember the first slot as our empty slot. */
> hdr->firstdb = (fbno - xfs_dir2_byte_to_db(args->geo,
> XFS_DIR2_FREE_OFFSET)) *
> - dp->d_ops->free_max_bests(args->geo);
> + args->geo->free_max_bests;
> } else {
> xfs_dir2_free_hdr_from_disk(mp, hdr, fbp->b_addr);
> }
> @@ -1737,7 +1735,7 @@ xfs_dir2_node_add_datablk(
>
> /* Extend the freespace table if the new data block is off the end. */
> if (*findex >= hdr->nvalid) {
> - ASSERT(*findex < dp->d_ops->free_max_bests(args->geo));
> + ASSERT(*findex < args->geo->free_max_bests);
> hdr->nvalid = *findex + 1;
> hdr->bests[*findex] = cpu_to_be16(NULLDATAOFF);
> }
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-11-04 20:24 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-01 22:06 remove m_dirops Christoph Hellwig
2019-11-01 22:06 ` [PATCH 01/34] xfs: move incore structures out of xfs_da_format.h Christoph Hellwig
2019-11-04 18:21 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 02/34] xfs: refactor btree node scrubbing Christoph Hellwig
2019-11-04 18:36 ` Darrick J. Wong
2019-11-05 1:35 ` Christoph Hellwig
2019-11-01 22:06 ` [PATCH 03/34] xfs: devirtualize ->node_hdr_from_disk Christoph Hellwig
2019-11-04 18:37 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 04/34] xfs: devirtualize ->node_hdr_to_disk Christoph Hellwig
2019-11-04 18:39 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 05/34] xfs: add a btree entries pointer to struct xfs_da3_icnode_hdr Christoph Hellwig
2019-11-04 19:52 ` Darrick J. Wong
2019-11-05 1:38 ` Christoph Hellwig
2019-11-05 1:58 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 06/34] xfs: move the node header size to struct xfs_da_geometry Christoph Hellwig
2019-11-04 19:58 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 07/34] xfs: devirtualize ->leaf_hdr_from_disk Christoph Hellwig
2019-11-04 19:59 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 08/34] xfs: devirtualize ->leaf_hdr_to_disk Christoph Hellwig
2019-11-04 20:00 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 09/34] xfs: add a entries pointer to struct xfs_dir3_icleaf_hdr Christoph Hellwig
2019-11-04 20:04 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 10/34] xfs: move the dir2 leaf header size to struct xfs_da_geometry Christoph Hellwig
2019-11-04 20:05 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 11/34] xfs: move the max dir2 leaf entries count " Christoph Hellwig
2019-11-04 20:07 ` Darrick J. Wong
2019-11-05 1:42 ` Christoph Hellwig
2019-11-05 1:58 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 12/34] xfs: devirtualize ->free_hdr_from_disk Christoph Hellwig
2019-11-04 20:08 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 13/34] xfs: devirtualize ->free_hdr_to_disk Christoph Hellwig
2019-11-04 20:08 ` Darrick J. Wong
2019-11-01 22:06 ` [PATCH 14/34] xfs: make the xfs_dir3_icfree_hdr available to xfs_dir2_node_addname_int Christoph Hellwig
2019-11-04 20:25 ` Darrick J. Wong
2019-11-05 1:52 ` Christoph Hellwig
2019-11-05 1:59 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 15/34] xfs: add a bests pointer to struct xfs_dir3_icfree_hdr Christoph Hellwig
2019-11-04 20:21 ` Darrick J. Wong
2019-11-05 1:44 ` Christoph Hellwig
2019-11-05 2:05 ` Darrick J. Wong
2019-11-05 16:44 ` Christoph Hellwig
2019-11-01 22:07 ` [PATCH 16/34] xfs: move the dir2 free header size to struct xfs_da_geometry Christoph Hellwig
2019-11-04 20:22 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 17/34] xfs: move the max dir2 free bests count " Christoph Hellwig
2019-11-04 20:23 ` Darrick J. Wong [this message]
2019-11-01 22:07 ` [PATCH 18/34] xfs: devirtualize ->db_to_fdb and ->db_to_fdindex Christoph Hellwig
2019-11-04 20:26 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 19/34] xfs: devirtualize ->sf_get_parent_ino and ->sf_put_parent_ino Christoph Hellwig
2019-11-04 20:26 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 20/34] xfs: devirtualize ->sf_entsize and ->sf_nextentry Christoph Hellwig
2019-11-04 20:28 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 21/34] xfs: devirtualize ->sf_get_ino and ->sf_put_ino Christoph Hellwig
2019-11-04 20:33 ` Darrick J. Wong
2019-11-07 1:05 ` Darrick J. Wong
2019-11-07 8:29 ` Christoph Hellwig
2019-11-01 22:07 ` [PATCH 22/34] xfs: devirtualize ->sf_get_ftype and ->sf_put_ftype Christoph Hellwig
2019-11-04 20:34 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 23/34] xfs: remove the ->data_dot_entry_p and ->data_dotdot_entry_p methods Christoph Hellwig
2019-11-04 20:37 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 24/34] xfs: remove the unused ->data_first_entry_p method Christoph Hellwig
2019-11-04 20:38 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 25/34] xfs: remove the ->data_entry_entry_p method Christoph Hellwig
2019-11-04 20:41 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 26/34] xfs: devirtualize ->data_entsize Christoph Hellwig
2019-11-04 20:45 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 27/34] xfs: devirtualize ->data_entry_tag_p Christoph Hellwig
2019-11-04 20:45 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 28/34] xfs: move the dir2 data block fixed offsets to struct xfs_da_geometry Christoph Hellwig
2019-11-04 20:46 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 29/34] xfs: cleanup xfs_dir2_data_entsize Christoph Hellwig
2019-11-04 20:48 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 30/34] xfs: devirtualize ->data_bestfree_p Christoph Hellwig
2019-11-04 20:49 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 31/34] xfs: devirtualize ->data_get_ftype and ->data_put_ftype Christoph Hellwig
2019-11-04 20:50 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 32/34] xfs: remove the now unused dir ops infrastructure Christoph Hellwig
2019-11-04 20:50 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 33/34] xfs: merge xfs_dir2_data_freescan and xfs_dir2_data_freescan_int Christoph Hellwig
2019-11-04 20:51 ` Darrick J. Wong
2019-11-01 22:07 ` [PATCH 34/34] xfs: always pass a valid hdr to xfs_dir3_leaf_check_int Christoph Hellwig
2019-11-04 20:53 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191104202307.GR4153244@magnolia \
--to=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).