xfs: move the max dir2 free bests count to struct xfs_da_geometry

Source kernel commit: 5893e4feb0eac11aab7b93ff9fe7e6e58bcec5ec

Move the max free bests count towards our structure for dir/attr
geometry parameters.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/db/check.c b/db/check.c
index f8a246c5001f335ef5cb89fca2aedb73c035a1c0..758b2142574ca06f74d089899b3ad7dfecd1aac0 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -3101,7 +3101,7 @@ process_leaf_node_dir_v3_free(
        int                     used;
 
        free = iocur_top->data;
-       maxent = M_DIROPS(mp)->free_max_bests(mp->m_dir_geo);
+       maxent = mp->m_dir_geo->free_max_bests;
        if (be32_to_cpu(free->hdr.firstdb) != xfs_dir2_da_to_db(mp->m_dir_geo,
                                        dabno - mp->m_dir_geo->freeblk) * maxent) {
                if (!sflag || v)
@@ -3179,7 +3179,7 @@ process_leaf_node_dir_v2_free(
                process_leaf_node_dir_v3_free(id, v, dabno, freetab);
                return;
        }
-       maxent = M_DIROPS(mp)->free_max_bests(mp->m_dir_geo);
+       maxent = mp->m_dir_geo->free_max_bests;
        if (be32_to_cpu(free->hdr.firstdb) != xfs_dir2_da_to_db(mp->m_dir_geo,
                                        dabno - mp->m_dir_geo->freeblk) * maxent) {
                if (!sflag || v)

diff --git a/libxfs/xfs_da_btree.h b/libxfs/xfs_da_btree.h
index e8f0b7ac051c8d4ba20fd3f4390c5c2a74ca1628..40110acf9f8a760165c45c4c41a301692e630e4a 100644 (file)
--- a/libxfs/xfs_da_btree.h
+++ b/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 */
        unsigned 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/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c
index 207a30a3fddd5eaa5285f43b106ec3049e37d515..acddf162226bb7d5653ddc396039525e2bb7ab92 100644 (file)
--- a/libxfs/xfs_da_format.c
+++ b/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/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c
index 4afe2d524d3be5ef5e0502739c55f27b15e0e195..c25f31cb9abbc819054025f56e6171e264b4e572 100644 (file)
--- a/libxfs/xfs_dir2.c
+++ b/libxfs/xfs_dir2.c
@@ -131,6 +131,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/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h
index d87cd71e3cf1879dbe66dfdbda1ded7ede92e728..e3c1385d1522107085ea4b090cd63c66c3a3a1c3 100644 (file)
--- a/libxfs/xfs_dir2.h
+++ b/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/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c
index 6b26e879a855ce3009808eaba910c0abab15244a..abbc3ff16159b6f3988e7f9d03a58d7d3a8bd6d5 100644 (file)
--- a/libxfs/xfs_dir2_node.c
+++ b/libxfs/xfs_dir2_node.c
@@ -157,10 +157,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;
@@ -559,8 +558,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);
 }
@@ -1337,7 +1335,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)));
        }
@@ -1730,7 +1728,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);
        }
@@ -1740,7 +1738,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);
        }

diff --git a/repair/phase6.c b/repair/phase6.c
index 98f0077becba1aebd10b7400a1a27cd8c25243ad..0c2047ff6b6cb1e1fde118e94f4c871a4dbe2565 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -2228,7 +2228,7 @@ longform_dir2_check_node(
                      freehdr.magic == XFS_DIR3_FREE_MAGIC) ||
                    freehdr.firstdb !=
                        (fdb - xfs_dir2_byte_to_db(mp->m_dir_geo, XFS_DIR2_FREE_OFFSET)) *
-                       M_DIROPS(mp)->free_max_bests(mp->m_dir_geo) ||
+                       mp->m_dir_geo->free_max_bests ||
                    freehdr.nvalid < freehdr.nused) {
                        do_warn(
        _("free block %u for directory inode %" PRIu64 " bad header\n"),