xfs: move the dir2 leaf header size to struct xfs_da_geometry

Move the leaf header size 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>

diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h
index 396b76ac02d6c947037328389731e4f9f12dde5f..b262ec403bba5269067166dd666dc92e18156437 100644 (file)
--- a/fs/xfs/libxfs/xfs_da_btree.h
+++ b/fs/xfs/libxfs/xfs_da_btree.h
@@ -26,6 +26,7 @@ struct xfs_da_geometry {
        unsigned int    node_ents;      /* # of entries in a danode */
        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 */
        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 ed21ce01502fde2618b59bfcb2f1c443b834b62a..a3e87f4788e0391e01f2c85ac8e54b3778df19e3 100644 (file)
--- a/fs/xfs/libxfs/xfs_da_format.c
+++ b/fs/xfs/libxfs/xfs_da_format.c
@@ -570,7 +570,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_hdr_size = sizeof(struct xfs_dir2_leaf_hdr),
        .leaf_max_ents = xfs_dir2_max_leaf_ents,
 
        .free_hdr_size = sizeof(struct xfs_dir2_free_hdr),
@@ -612,7 +611,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_hdr_size = sizeof(struct xfs_dir2_leaf_hdr),
        .leaf_max_ents = xfs_dir2_max_leaf_ents,
 
        .free_hdr_size = sizeof(struct xfs_dir2_free_hdr),
@@ -654,7 +652,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_hdr_size = sizeof(struct xfs_dir3_leaf_hdr),
        .leaf_max_ents = xfs_dir3_max_leaf_ents,
 
        .free_hdr_size = sizeof(struct xfs_dir3_free_hdr),

diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c
index 98cc0631e7d54b62d07a9c1550318229362dbac5..6e7a4e9ced5eb5d90d292674384acc5f2627b46b 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2.c
+++ b/fs/xfs/libxfs/xfs_dir2.c
@@ -122,10 +122,13 @@ xfs_da_mount(
        dageo->fsblog = mp->m_sb.sb_blocklog;
        dageo->blksize = xfs_dir2_dirblock_bytes(&mp->m_sb);
        dageo->fsbcount = 1 << mp->m_sb.sb_dirblklog;
-       if (xfs_sb_version_hascrc(&mp->m_sb))
+       if (xfs_sb_version_hascrc(&mp->m_sb)) {
                dageo->node_hdr_size = sizeof(struct xfs_da3_node_hdr);
-       else
+               dageo->leaf_hdr_size = sizeof(struct xfs_dir3_leaf_hdr);
+       } else {
                dageo->node_hdr_size = sizeof(struct xfs_da_node_hdr);
+               dageo->leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr);
+       }
 
        /*
         * 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 b46657974134e285811cfa4e3213792cb283927a..544adee5dd120004b3e4495ed028fc0e0deef615 100644 (file)
--- 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     leaf_hdr_size;
        int     (*leaf_max_ents)(struct xfs_da_geometry *geo);
 
        int     free_hdr_size;

diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c
index 5e3e96efdacae2c4ac4fda87bdb031dd74662217..888d4b0acab8a3f621d48b2fb7fd73cb8b5a1cba 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2_leaf.c
+++ b/fs/xfs/libxfs/xfs_dir2_leaf.c
@@ -1132,7 +1132,7 @@ xfs_dir3_leaf_log_header(
 
        xfs_trans_log_buf(args->trans, bp,
                          (uint)((char *)&leaf->hdr - (char *)leaf),
-                         args->dp->d_ops->leaf_hdr_size - 1);
+                         args->geo->leaf_hdr_size - 1);
 }
 
 /*

diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
index 721dd2dcba8dee5d601aea368a564115c5244f8f..f7ba4d22165c62f963714d6adb194883c53251c4 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2_node.c
+++ b/fs/xfs/libxfs/xfs_dir2_node.c
@@ -1340,7 +1340,7 @@ xfs_dir2_leafn_remove(
         * Return indication of whether this leaf block is empty enough
         * to justify trying to join it with a neighbor.
         */
-       *rval = (dp->d_ops->leaf_hdr_size +
+       *rval = (args->geo->leaf_hdr_size +
                 (uint)sizeof(leafhdr.ents) * (leafhdr.count - leafhdr.stale)) <
                args->geo->magicpct;
        return 0;
@@ -1446,7 +1446,7 @@ xfs_dir2_leafn_toosmall(
        xfs_dir3_leaf_check(dp, blk->bp);
 
        count = leafhdr.count - leafhdr.stale;
-       bytes = dp->d_ops->leaf_hdr_size + count * sizeof(ents[0]);
+       bytes = state->args->geo->leaf_hdr_size + count * sizeof(ents[0]);
        if (bytes > (state->args->geo->blksize >> 1)) {
                /*
                 * Blk over 50%, don't try to join.