| Message ID | 20191101220719.29100-12-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [01/34] xfs: move incore structures out of xfs_da_format.h | expand |
On Fri, Nov 01, 2019 at 03:06:56PM -0700, Christoph Hellwig wrote: > Move the max leaf entries count towards our structure for dir/attr > geometry parameters. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > fs/xfs/libxfs/xfs_da_btree.h | 1 + > fs/xfs/libxfs/xfs_da_format.c | 23 ----------------------- > fs/xfs/libxfs/xfs_dir2.c | 2 ++ > fs/xfs/libxfs/xfs_dir2.h | 2 -- > fs/xfs/libxfs/xfs_dir2_leaf.c | 2 +- > fs/xfs/libxfs/xfs_dir2_node.c | 2 +- > fs/xfs/scrub/dir.c | 3 +-- > 7 files changed, 6 insertions(+), 29 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h > index 5e3e954fee77..c8b137685ca7 100644 > --- a/fs/xfs/libxfs/xfs_da_btree.h > +++ b/fs/xfs/libxfs/xfs_da_btree.h > @@ -27,6 +27,7 @@ struct xfs_da_geometry { > int magicpct; /* 37% of block size in bytes */ > xfs_dablk_t datablk; /* blockno of dir data v2 */ > int leaf_hdr_size; /* dir2 leaf header size */ > + unsigned int leaf_max_ents; /* # of entries in dir2 leaf */ Why does this one get 'unsigned' but the header size fields don't? Or maybe I should rephase that: Why aren't the header sizes unsigned too? Looks good to me otherwise, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > xfs_dablk_t leafblk; /* blockno of leaf data v2 */ > 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 a3e87f4788e0..fe9e20698719 100644 > --- a/fs/xfs/libxfs/xfs_da_format.c > +++ b/fs/xfs/libxfs/xfs_da_format.c > @@ -401,23 +401,6 @@ xfs_dir3_data_unused_p(struct xfs_dir2_data_hdr *hdr) > } > > > -/* > - * Directory Leaf block operations > - */ > -static int > -xfs_dir2_max_leaf_ents(struct xfs_da_geometry *geo) > -{ > - return (geo->blksize - sizeof(struct xfs_dir2_leaf_hdr)) / > - (uint)sizeof(struct xfs_dir2_leaf_entry); > -} > - > -static int > -xfs_dir3_max_leaf_ents(struct xfs_da_geometry *geo) > -{ > - return (geo->blksize - sizeof(struct xfs_dir3_leaf_hdr)) / > - (uint)sizeof(struct xfs_dir2_leaf_entry); > -} > - > /* > * Directory free space block operations > */ > @@ -570,8 +553,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, > > - .leaf_max_ents = xfs_dir2_max_leaf_ents, > - > .free_hdr_size = sizeof(struct xfs_dir2_free_hdr), > .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, > .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk, > @@ -611,8 +592,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, > > - .leaf_max_ents = xfs_dir2_max_leaf_ents, > - > .free_hdr_size = sizeof(struct xfs_dir2_free_hdr), > .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, > .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk, > @@ -652,8 +631,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, > > - .leaf_max_ents = xfs_dir3_max_leaf_ents, > - > .free_hdr_size = sizeof(struct xfs_dir3_free_hdr), > .free_hdr_to_disk = xfs_dir3_free_hdr_to_disk, > .free_hdr_from_disk = xfs_dir3_free_hdr_from_disk, > diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c > index 94badb28fd1a..9f88b9885747 100644 > --- a/fs/xfs/libxfs/xfs_dir2.c > +++ b/fs/xfs/libxfs/xfs_dir2.c > @@ -129,6 +129,8 @@ xfs_da_mount( > dageo->node_hdr_size = sizeof(struct xfs_da_node_hdr); > dageo->leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr); > } > + dageo->leaf_max_ents = (dageo->blksize - dageo->leaf_hdr_size) / > + sizeof(struct xfs_dir2_leaf_entry); > > /* > * 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 544adee5dd12..ee18fc56a6a1 100644 > --- a/fs/xfs/libxfs/xfs_dir2.h > +++ b/fs/xfs/libxfs/xfs_dir2.h > @@ -72,8 +72,6 @@ struct xfs_dir_ops { > struct xfs_dir2_data_unused * > (*data_unused_p)(struct xfs_dir2_data_hdr *hdr); > > - int (*leaf_max_ents)(struct xfs_da_geometry *geo); > - > int free_hdr_size; > void (*free_hdr_to_disk)(struct xfs_dir2_free *to, > struct xfs_dir3_icfree_hdr *from); > diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c > index f72fd8182223..38d42fe1aa02 100644 > --- a/fs/xfs/libxfs/xfs_dir2_leaf.c > +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c > @@ -167,7 +167,7 @@ xfs_dir3_leaf_check_int( > * Should factor in the size of the bests table as well. > * We can deduce a value for that from di_size. > */ > - if (hdr->count > ops->leaf_max_ents(geo)) > + if (hdr->count > geo->leaf_max_ents) > return __this_address; > > /* Leaves and bests don't overlap in leaf format. */ > diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c > index 76f31909376e..3b9ed6ac72b6 100644 > --- a/fs/xfs/libxfs/xfs_dir2_node.c > +++ b/fs/xfs/libxfs/xfs_dir2_node.c > @@ -455,7 +455,7 @@ xfs_dir2_leafn_add( > * a compact. > */ > > - if (leafhdr.count == dp->d_ops->leaf_max_ents(args->geo)) { > + if (leafhdr.count == args->geo->leaf_max_ents) { > if (!leafhdr.stale) > return -ENOSPC; > compact = leafhdr.stale > 1; > diff --git a/fs/xfs/scrub/dir.c b/fs/xfs/scrub/dir.c > index 27fdf8978467..e4e189d3c1c0 100644 > --- a/fs/xfs/scrub/dir.c > +++ b/fs/xfs/scrub/dir.c > @@ -487,7 +487,6 @@ xchk_directory_leaf1_bestfree( > struct xfs_dir2_leaf *leaf; > struct xfs_buf *dbp; > struct xfs_buf *bp; > - const struct xfs_dir_ops *d_ops = sc->ip->d_ops; > struct xfs_da_geometry *geo = sc->mp->m_dir_geo; > __be16 *bestp; > __u16 best; > @@ -527,7 +526,7 @@ xchk_directory_leaf1_bestfree( > } > > /* Is the leaf count even remotely sane? */ > - if (leafhdr.count > d_ops->leaf_max_ents(geo)) { > + if (leafhdr.count > geo->leaf_max_ents) { > xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, lblk); > goto out; > } > -- > 2.20.1 >
On Mon, Nov 04, 2019 at 12:07:44PM -0800, Darrick J. Wong wrote: > > diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h > > index 5e3e954fee77..c8b137685ca7 100644 > > --- a/fs/xfs/libxfs/xfs_da_btree.h > > +++ b/fs/xfs/libxfs/xfs_da_btree.h > > @@ -27,6 +27,7 @@ struct xfs_da_geometry { > > int magicpct; /* 37% of block size in bytes */ > > xfs_dablk_t datablk; /* blockno of dir data v2 */ > > int leaf_hdr_size; /* dir2 leaf header size */ > > + unsigned int leaf_max_ents; /* # of entries in dir2 leaf */ > > Why does this one get 'unsigned' but the header size fields don't? > Or maybe I should rephase that: Why aren't the header sizes unsigned > too? They probably should all be unsigned and I should add a prep patch for the existing ones.
On Tue, Nov 05, 2019 at 02:42:15AM +0100, Christoph Hellwig wrote: > On Mon, Nov 04, 2019 at 12:07:44PM -0800, Darrick J. Wong wrote: > > > diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h > > > index 5e3e954fee77..c8b137685ca7 100644 > > > --- a/fs/xfs/libxfs/xfs_da_btree.h > > > +++ b/fs/xfs/libxfs/xfs_da_btree.h > > > @@ -27,6 +27,7 @@ struct xfs_da_geometry { > > > int magicpct; /* 37% of block size in bytes */ > > > xfs_dablk_t datablk; /* blockno of dir data v2 */ > > > int leaf_hdr_size; /* dir2 leaf header size */ > > > + unsigned int leaf_max_ents; /* # of entries in dir2 leaf */ > > > > Why does this one get 'unsigned' but the header size fields don't? > > Or maybe I should rephase that: Why aren't the header sizes unsigned > > too? > > They probably should all be unsigned and I should add a prep patch > for the existing ones. Sounds good! --D
diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h index 5e3e954fee77..c8b137685ca7 100644 --- a/fs/xfs/libxfs/xfs_da_btree.h +++ b/fs/xfs/libxfs/xfs_da_btree.h @@ -27,6 +27,7 @@ struct xfs_da_geometry { int magicpct; /* 37% of block size in bytes */ xfs_dablk_t datablk; /* blockno of dir data v2 */ int leaf_hdr_size; /* dir2 leaf header size */ + unsigned int leaf_max_ents; /* # of entries in dir2 leaf */ xfs_dablk_t leafblk; /* blockno of leaf data v2 */ 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 a3e87f4788e0..fe9e20698719 100644 --- a/fs/xfs/libxfs/xfs_da_format.c +++ b/fs/xfs/libxfs/xfs_da_format.c @@ -401,23 +401,6 @@ xfs_dir3_data_unused_p(struct xfs_dir2_data_hdr *hdr) } -/* - * Directory Leaf block operations - */ -static int -xfs_dir2_max_leaf_ents(struct xfs_da_geometry *geo) -{ - return (geo->blksize - sizeof(struct xfs_dir2_leaf_hdr)) / - (uint)sizeof(struct xfs_dir2_leaf_entry); -} - -static int -xfs_dir3_max_leaf_ents(struct xfs_da_geometry *geo) -{ - return (geo->blksize - sizeof(struct xfs_dir3_leaf_hdr)) / - (uint)sizeof(struct xfs_dir2_leaf_entry); -} - /* * Directory free space block operations */ @@ -570,8 +553,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, - .leaf_max_ents = xfs_dir2_max_leaf_ents, - .free_hdr_size = sizeof(struct xfs_dir2_free_hdr), .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk, @@ -611,8 +592,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, - .leaf_max_ents = xfs_dir2_max_leaf_ents, - .free_hdr_size = sizeof(struct xfs_dir2_free_hdr), .free_hdr_to_disk = xfs_dir2_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir2_free_hdr_from_disk, @@ -652,8 +631,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, - .leaf_max_ents = xfs_dir3_max_leaf_ents, - .free_hdr_size = sizeof(struct xfs_dir3_free_hdr), .free_hdr_to_disk = xfs_dir3_free_hdr_to_disk, .free_hdr_from_disk = xfs_dir3_free_hdr_from_disk, diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c index 94badb28fd1a..9f88b9885747 100644 --- a/fs/xfs/libxfs/xfs_dir2.c +++ b/fs/xfs/libxfs/xfs_dir2.c @@ -129,6 +129,8 @@ xfs_da_mount( dageo->node_hdr_size = sizeof(struct xfs_da_node_hdr); dageo->leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr); } + dageo->leaf_max_ents = (dageo->blksize - dageo->leaf_hdr_size) / + sizeof(struct xfs_dir2_leaf_entry); /* * 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 544adee5dd12..ee18fc56a6a1 100644 --- a/fs/xfs/libxfs/xfs_dir2.h +++ b/fs/xfs/libxfs/xfs_dir2.h @@ -72,8 +72,6 @@ struct xfs_dir_ops { struct xfs_dir2_data_unused * (*data_unused_p)(struct xfs_dir2_data_hdr *hdr); - int (*leaf_max_ents)(struct xfs_da_geometry *geo); - int free_hdr_size; void (*free_hdr_to_disk)(struct xfs_dir2_free *to, struct xfs_dir3_icfree_hdr *from); diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c index f72fd8182223..38d42fe1aa02 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c @@ -167,7 +167,7 @@ xfs_dir3_leaf_check_int( * Should factor in the size of the bests table as well. * We can deduce a value for that from di_size. */ - if (hdr->count > ops->leaf_max_ents(geo)) + if (hdr->count > geo->leaf_max_ents) return __this_address; /* Leaves and bests don't overlap in leaf format. */ diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index 76f31909376e..3b9ed6ac72b6 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -455,7 +455,7 @@ xfs_dir2_leafn_add( * a compact. */ - if (leafhdr.count == dp->d_ops->leaf_max_ents(args->geo)) { + if (leafhdr.count == args->geo->leaf_max_ents) { if (!leafhdr.stale) return -ENOSPC; compact = leafhdr.stale > 1; diff --git a/fs/xfs/scrub/dir.c b/fs/xfs/scrub/dir.c index 27fdf8978467..e4e189d3c1c0 100644 --- a/fs/xfs/scrub/dir.c +++ b/fs/xfs/scrub/dir.c @@ -487,7 +487,6 @@ xchk_directory_leaf1_bestfree( struct xfs_dir2_leaf *leaf; struct xfs_buf *dbp; struct xfs_buf *bp; - const struct xfs_dir_ops *d_ops = sc->ip->d_ops; struct xfs_da_geometry *geo = sc->mp->m_dir_geo; __be16 *bestp; __u16 best; @@ -527,7 +526,7 @@ xchk_directory_leaf1_bestfree( } /* Is the leaf count even remotely sane? */ - if (leafhdr.count > d_ops->leaf_max_ents(geo)) { + if (leafhdr.count > geo->leaf_max_ents) { xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, lblk); goto out; }
Move the max leaf entries count towards our structure for dir/attr geometry parameters. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/libxfs/xfs_da_btree.h | 1 + fs/xfs/libxfs/xfs_da_format.c | 23 ----------------------- fs/xfs/libxfs/xfs_dir2.c | 2 ++ fs/xfs/libxfs/xfs_dir2.h | 2 -- fs/xfs/libxfs/xfs_dir2_leaf.c | 2 +- fs/xfs/libxfs/xfs_dir2_node.c | 2 +- fs/xfs/scrub/dir.c | 3 +-- 7 files changed, 6 insertions(+), 29 deletions(-)