xfs: move the dir2 free header size to struct xfs_da_geometry

Source kernel commit: ed1d612fbe6ba95a4d16b56bbfb1f90d48a42149

Move the free 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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_da_btree.h b/libxfs/xfs_da_btree.h
index c6ff5329e92b8ffe3a978646677f43c7ccfb9139..e8f0b7ac051c8d4ba20fd3f4390c5c2a74ca1628 100644 (file)
--- a/libxfs/xfs_da_btree.h
+++ b/libxfs/xfs_da_btree.h
@@ -29,6 +29,7 @@ struct xfs_da_geometry {
        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 */
+       unsigned int    free_hdr_size;  /* dir2 free header size */
        xfs_dablk_t     freeblk;        /* blockno of free data v2 */
 };
 

diff --git a/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c
index a3721ab3d38f4da68126b0480d07214506e26e67..207a30a3fddd5eaa5285f43b106ec3049e37d515 100644 (file)
--- a/libxfs/xfs_da_format.c
+++ b/libxfs/xfs_da_format.c
@@ -486,7 +486,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_hdr_size = sizeof(struct xfs_dir2_free_hdr),
        .free_max_bests = xfs_dir2_free_max_bests,
        .db_to_fdb = xfs_dir2_db_to_fdb,
        .db_to_fdindex = xfs_dir2_db_to_fdindex,
@@ -522,7 +521,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_hdr_size = sizeof(struct xfs_dir2_free_hdr),
        .free_max_bests = xfs_dir2_free_max_bests,
        .db_to_fdb = xfs_dir2_db_to_fdb,
        .db_to_fdindex = xfs_dir2_db_to_fdindex,
@@ -558,7 +556,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_hdr_size = sizeof(struct xfs_dir3_free_hdr),
        .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 b4274cd07f8574b615616c22178cc30ea7f004b4..4afe2d524d3be5ef5e0502739c55f27b15e0e195 100644 (file)
--- a/libxfs/xfs_dir2.c
+++ b/libxfs/xfs_dir2.c
@@ -123,9 +123,11 @@ xfs_da_mount(
        if (xfs_sb_version_hascrc(&mp->m_sb)) {
                dageo->node_hdr_size = sizeof(struct xfs_da3_node_hdr);
                dageo->leaf_hdr_size = sizeof(struct xfs_dir3_leaf_hdr);
+               dageo->free_hdr_size = sizeof(struct xfs_dir3_free_hdr);
        } else {
                dageo->node_hdr_size = sizeof(struct xfs_da_node_hdr);
                dageo->leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr);
+               dageo->free_hdr_size = sizeof(struct xfs_dir2_free_hdr);
        }
        dageo->leaf_max_ents = (dageo->blksize - dageo->leaf_hdr_size) /
                        sizeof(struct xfs_dir2_leaf_entry);

diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h
index 402f00326b642d29bc806729837a559b57b003ea..d87cd71e3cf1879dbe66dfdbda1ded7ede92e728 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_hdr_size;
        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);

diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c
index 192980a9749c515b0d5da1740deae7f343180338..6b26e879a855ce3009808eaba910c0abab15244a 100644 (file)
--- a/libxfs/xfs_dir2_node.c
+++ b/libxfs/xfs_dir2_node.c
@@ -369,7 +369,7 @@ xfs_dir2_free_log_header(
               free->hdr.magic == cpu_to_be32(XFS_DIR3_FREE_MAGIC));
 #endif
        xfs_trans_log_buf(args->trans, bp, 0,
-                         args->dp->d_ops->free_hdr_size - 1);
+                         args->geo->free_hdr_size - 1);
 }
 
 /*