xfs: move the max dir2 leaf entries count to struct xfs_da_geometry

Source kernel commit: 478c7835cb8ee28e73e732642866995f8555df7e

Move the max leaf entries 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/libxfs/xfs_da_btree.h b/libxfs/xfs_da_btree.h
index b262ec403bba5269067166dd666dc92e18156437..c6ff5329e92b8ffe3a978646677f43c7ccfb9139 100644 (file)
--- a/libxfs/xfs_da_btree.h
+++ b/libxfs/xfs_da_btree.h
@@ -27,6 +27,7 @@ struct xfs_da_geometry {
        unsigned int    magicpct;       /* 37% of block size in bytes */
        xfs_dablk_t     datablk;        /* blockno of dir data v2 */
        unsigned 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/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c
index c6fb204c6dae0cd17a68bb52d9c69d091b9e5129..2ba880be637d0f62f5a5b7bcf943a1bdcf16d4d2 100644 (file)
--- a/libxfs/xfs_da_format.c
+++ b/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/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c
index 5557e5f393e1f82bbc566f099c7ecd0691bba8c7..b4274cd07f8574b615616c22178cc30ea7f004b4 100644 (file)
--- a/libxfs/xfs_dir2.c
+++ b/libxfs/xfs_dir2.c
@@ -127,6 +127,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/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h
index 544adee5dd120004b3e4495ed028fc0e0deef615..ee18fc56a6a1a4430b7ecf128b92f018ffcc4f90 100644 (file)
--- a/libxfs/xfs_dir2.h
+++ b/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/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c
index 037900be50a55903c7c7bf32fac6b308a76a3fe8..cca56370632c5a857c6958bbd8f868e6a141119e 100644 (file)
--- a/libxfs/xfs_dir2_leaf.c
+++ b/libxfs/xfs_dir2_leaf.c
@@ -165,7 +165,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/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c
index dad0dab7ba1bcd3979b552dcc89530e4218c326a..81c5ef9193b4e3d7e3703b1c0a50927cb47f008c 100644 (file)
--- a/libxfs/xfs_dir2_node.c
+++ b/libxfs/xfs_dir2_node.c
@@ -456,7 +456,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/repair/phase6.c b/repair/phase6.c
index 0d722cc8d6b1265f4384e5e20960ec6184a8ecf6..a31597c5fa125e26ab0078d7a720ce54e8646fea 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -2065,8 +2065,7 @@ longform_dir2_check_leaf(
              leafhdr.magic == XFS_DIR3_LEAF1_MAGIC) ||
                                leafhdr.forw || leafhdr.back ||
                                leafhdr.count < leafhdr.stale ||
-                               leafhdr.count >
-                                       M_DIROPS(mp)->leaf_max_ents(mp->m_dir_geo) ||
+                               leafhdr.count > mp->m_dir_geo->leaf_max_ents ||
                                (char *)&ents[leafhdr.count] > (char *)bestsp) {
                do_warn(
        _("leaf block %u for directory inode %" PRIu64 " bad header\n"),
@@ -2189,7 +2188,7 @@ longform_dir2_check_node(
                 * the right ops on the buffer for when we write it back out.
                 */
                bp->b_ops = &xfs_dir3_leafn_buf_ops;
-               if (leafhdr.count > M_DIROPS(mp)->leaf_max_ents(mp->m_dir_geo) ||
+               if (leafhdr.count > mp->m_dir_geo->leaf_max_ents ||
                    leafhdr.count < leafhdr.stale) {
                        do_warn(
        _("leaf block %u for directory inode %" PRIu64 " bad header\n"),