]> www.infradead.org Git - users/hch/xfsprogs.git/commitdiff
xfs: move the dir2 leaf header size to struct xfs_da_geometry
authorChristoph Hellwig <hch@lst.de>
Wed, 22 Jan 2020 16:29:41 +0000 (11:29 -0500)
committerEric Sandeen <sandeen@redhat.com>
Wed, 22 Jan 2020 16:29:41 +0000 (11:29 -0500)
Source kernel commit: 545910bcc875377160b7b669e790865602a006f3

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
libxfs/xfs_da_btree.h
libxfs/xfs_da_format.c
libxfs/xfs_dir2.c
libxfs/xfs_dir2.h
libxfs/xfs_dir2_leaf.c
libxfs/xfs_dir2_node.c

index 396b76ac02d6c947037328389731e4f9f12dde5f..b262ec403bba5269067166dd666dc92e18156437 100644 (file)
@@ -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 */
 };
index fe888239e0d432993ef5ed7d8953ba386af65881..c6fb204c6dae0cd17a68bb52d9c69d091b9e5129 100644 (file)
@@ -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),
index 168a7b7a1899e2129bdcd675f7d4d22cbccd5f77..5557e5f393e1f82bbc566f099c7ecd0691bba8c7 100644 (file)
@@ -120,10 +120,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
index b46657974134e285811cfa4e3213792cb283927a..544adee5dd120004b3e4495ed028fc0e0deef615 100644 (file)
@@ -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;
index 7a22972d6ca888cdf5135b8af6081de00ebe5744..037900be50a55903c7c7bf32fac6b308a76a3fe8 100644 (file)
@@ -1130,7 +1130,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);
 }
 
 /*
index d4b1f2311624a715354b15b98947d7e53cb53632..dad0dab7ba1bcd3979b552dcc89530e4218c326a 100644 (file)
@@ -1337,7 +1337,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;
@@ -1443,7 +1443,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.