xfs: remove the data_dotdot_offset field in struct xfs_dir_ops

The data_dotdot_offset value is always equal to data_entry_offset plus
the fixed size of the "." entry.  Right now calculating that fixed size
requires an indirect call, but by the end of this series it will be
an inline function that can be constant folded.

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_format.c b/fs/xfs/libxfs/xfs_da_format.c
index 54754eef24377e8539e017cf442b6bebc809205c..7b783b11790d21ed7b7d5917b3e12b8bcd8ebb05 100644 (file)
--- a/fs/xfs/libxfs/xfs_da_format.c
+++ b/fs/xfs/libxfs/xfs_da_format.c
@@ -204,8 +204,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = {
        .data_entry_tag_p = xfs_dir2_data_entry_tag_p,
        .data_bestfree_p = xfs_dir2_data_bestfree_p,
 
-       .data_dotdot_offset = sizeof(struct xfs_dir2_data_hdr) +
-                               XFS_DIR2_DATA_ENTSIZE(1),
        .data_first_offset =  sizeof(struct xfs_dir2_data_hdr) +
                                XFS_DIR2_DATA_ENTSIZE(1) +
                                XFS_DIR2_DATA_ENTSIZE(2),
@@ -224,8 +222,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
        .data_entry_tag_p = xfs_dir3_data_entry_tag_p,
        .data_bestfree_p = xfs_dir2_data_bestfree_p,
 
-       .data_dotdot_offset = sizeof(struct xfs_dir2_data_hdr) +
-                               XFS_DIR3_DATA_ENTSIZE(1),
        .data_first_offset =  sizeof(struct xfs_dir2_data_hdr) +
                                XFS_DIR3_DATA_ENTSIZE(1) +
                                XFS_DIR3_DATA_ENTSIZE(2),
@@ -244,8 +240,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = {
        .data_entry_tag_p = xfs_dir3_data_entry_tag_p,
        .data_bestfree_p = xfs_dir3_data_bestfree_p,
 
-       .data_dotdot_offset = sizeof(struct xfs_dir3_data_hdr) +
-                               XFS_DIR3_DATA_ENTSIZE(1),
        .data_first_offset =  sizeof(struct xfs_dir3_data_hdr) +
                                XFS_DIR3_DATA_ENTSIZE(1) +
                                XFS_DIR3_DATA_ENTSIZE(2),

diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
index 94e8c40a7d19d40463d5acdff9b02c76e99917fb..8b937993263d89ec5a3212ea47c0183d066d3d27 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2.h
+++ b/fs/xfs/libxfs/xfs_dir2.h
@@ -40,7 +40,6 @@ struct xfs_dir_ops {
        struct xfs_dir2_data_free *
                (*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr);
 
-       xfs_dir2_data_aoff_t data_dotdot_offset;
        xfs_dir2_data_aoff_t data_first_offset;
        size_t  data_entry_offset;
 

diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
index 39985ca6ae2d1013b4f33b644228a6a0a3b3fb8e..187bb51875c29d5b7b440cb2054c9fc3d01bee26 100644 (file)
--- a/fs/xfs/xfs_dir2_readdir.c
+++ b/fs/xfs/xfs_dir2_readdir.c
@@ -77,7 +77,8 @@ xfs_dir2_sf_getdents(
        dot_offset = xfs_dir2_db_off_to_dataptr(geo, geo->datablk,
                        dp->d_ops->data_entry_offset);
        dotdot_offset = xfs_dir2_db_off_to_dataptr(geo, geo->datablk,
-                                               dp->d_ops->data_dotdot_offset);
+                       dp->d_ops->data_entry_offset +
+                       dp->d_ops->data_entsize(sizeof(".") - 1));
 
        /*
         * Put . entry unless we're starting past it.