xfs: devirtualize ->sf_get_parent_ino and ->sf_put_parent_ino

Source kernel commit: 84915e1bdddf9de3edf79a2813982b886e76658f

The parent inode handling is the same for all directory format variants,
just use direct calls instead of going through a pointless indirect
call.

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/db/check.c b/db/check.c
index 758b2142574ca06f74d089899b3ad7dfecd1aac0..0971accc51c8b52a28eb5faef0d2a41e3d924c29 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -3684,7 +3684,7 @@ process_sf_dir_v2(
                        dbprintf(_("dir %llu offsets too high\n"), id->ino);
                error++;
        }
-       lino = M_DIROPS(mp)->sf_get_parent_ino(sf);
+       lino = libxfs_dir2_sf_get_parent_ino(sf);
        if (lino > XFS_DIR2_MAX_SHORT_INUM)
                i8++;
        cid = find_inode(lino, 1);

diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index 8770e317827829ab5343df15b4deee0258d24d23..5a3307657446ff68f15ad5b5b6ff244c27a9681d 100644 (file)
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -85,6 +85,9 @@
 #define xfs_dir2_data_make_free                libxfs_dir2_data_make_free
 #define xfs_dir2_data_use_free         libxfs_dir2_data_use_free
 #define xfs_dir2_shrink_inode          libxfs_dir2_shrink_inode
+#define xfs_dir2_sf_get_parent_ino     libxfs_dir2_sf_get_parent_ino
+#define xfs_dir2_sf_put_parent_ino     libxfs_dir2_sf_put_parent_ino
+#define xfs_dir2_namecheck             libxfs_dir2_namecheck
 #define xfs_da_get_buf                 libxfs_da_get_buf
 
 #define xfs_inode_from_disk            libxfs_inode_from_disk
@@ -149,7 +152,6 @@
 #define xfs_default_ifork_ops          libxfs_default_ifork_ops
 #define xfs_fs_geometry                        libxfs_fs_geometry
 #define xfs_init_local_fork            libxfs_init_local_fork
-#define xfs_dir2_namecheck             libxfs_dir2_namecheck
 #define xfs_attr_namecheck             libxfs_attr_namecheck
 
 #define LIBXFS_ATTR_ROOT               ATTR_ROOT

diff --git a/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c
index 22951c05260f2a88244fc46c5d232537d7c697e9..c6b2cad22250297e20a430cb310c2044f758b854 100644 (file)
--- a/libxfs/xfs_da_format.c
+++ b/libxfs/xfs_da_format.c
@@ -132,14 +132,14 @@ xfs_dir2_sf_put_ino(
                put_unaligned_be32(ino, to);
 }
 
-static xfs_ino_t
+xfs_ino_t
 xfs_dir2_sf_get_parent_ino(
        struct xfs_dir2_sf_hdr  *hdr)
 {
        return xfs_dir2_sf_get_ino(hdr, hdr->parent);
 }
 
-static void
+void
 xfs_dir2_sf_put_parent_ino(
        struct xfs_dir2_sf_hdr  *hdr,
        xfs_ino_t               ino)
@@ -407,8 +407,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = {
        .sf_put_ftype = xfs_dir2_sfe_put_ftype,
        .sf_get_ino = xfs_dir2_sfe_get_ino,
        .sf_put_ino = xfs_dir2_sfe_put_ino,
-       .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino,
-       .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino,
 
        .data_entsize = xfs_dir2_data_entsize,
        .data_get_ftype = xfs_dir2_data_get_ftype,
@@ -438,8 +436,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
        .sf_put_ftype = xfs_dir3_sfe_put_ftype,
        .sf_get_ino = xfs_dir3_sfe_get_ino,
        .sf_put_ino = xfs_dir3_sfe_put_ino,
-       .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino,
-       .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino,
 
        .data_entsize = xfs_dir3_data_entsize,
        .data_get_ftype = xfs_dir3_data_get_ftype,
@@ -469,8 +465,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = {
        .sf_put_ftype = xfs_dir3_sfe_put_ftype,
        .sf_get_ino = xfs_dir3_sfe_get_ino,
        .sf_put_ino = xfs_dir3_sfe_put_ino,
-       .sf_get_parent_ino = xfs_dir2_sf_get_parent_ino,
-       .sf_put_parent_ino = xfs_dir2_sf_put_parent_ino,
 
        .data_entsize = xfs_dir3_data_entsize,
        .data_get_ftype = xfs_dir3_data_get_ftype,

diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h
index e302679d8c80aa6a6bf7984428def020bf0e4520..d3a0b8daab5ff55d666c18c837f6ecd493b76aff 100644 (file)
--- a/libxfs/xfs_dir2.h
+++ b/libxfs/xfs_dir2.h
@@ -44,9 +44,6 @@ struct xfs_dir_ops {
        void    (*sf_put_ino)(struct xfs_dir2_sf_hdr *hdr,
                              struct xfs_dir2_sf_entry *sfep,
                              xfs_ino_t ino);
-       xfs_ino_t (*sf_get_parent_ino)(struct xfs_dir2_sf_hdr *hdr);
-       void    (*sf_put_parent_ino)(struct xfs_dir2_sf_hdr *hdr,
-                                    xfs_ino_t ino);
 
        int     (*data_entsize)(int len);
        uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep);

diff --git a/libxfs/xfs_dir2_block.c b/libxfs/xfs_dir2_block.c
index d74cb7e51a1d645e88ee4418a80e8a4246d6de43..d4246e220b94be8a1f719b3b133de87f1b66af37 100644 (file)
--- a/libxfs/xfs_dir2_block.c
+++ b/libxfs/xfs_dir2_block.c
@@ -1154,7 +1154,7 @@ xfs_dir2_sf_to_block(
         * Create entry for ..
         */
        dep = dp->d_ops->data_dotdot_entry_p(hdr);
-       dep->inumber = cpu_to_be64(dp->d_ops->sf_get_parent_ino(sfp));
+       dep->inumber = cpu_to_be64(xfs_dir2_sf_get_parent_ino(sfp));
        dep->namelen = 2;
        dep->name[0] = dep->name[1] = '.';
        dp->d_ops->data_put_ftype(dep, XFS_DIR3_FT_DIR);

diff --git a/libxfs/xfs_dir2_priv.h b/libxfs/xfs_dir2_priv.h
index 9128f7aae0beb7ffbb906a4dfaf19a449e788c91..bb50853d09880b1d547fe438feaf093240923d16 100644 (file)
--- a/libxfs/xfs_dir2_priv.h
+++ b/libxfs/xfs_dir2_priv.h
@@ -145,6 +145,8 @@ extern int xfs_dir2_free_read(struct xfs_trans *tp, struct xfs_inode *dp,
                xfs_dablk_t fbno, struct xfs_buf **bpp);
 
 /* xfs_dir2_sf.c */
+xfs_ino_t xfs_dir2_sf_get_parent_ino(struct xfs_dir2_sf_hdr *hdr);
+void xfs_dir2_sf_put_parent_ino(struct xfs_dir2_sf_hdr *hdr, xfs_ino_t ino);
 extern int xfs_dir2_block_sfsize(struct xfs_inode *dp,
                struct xfs_dir2_data_hdr *block, struct xfs_dir2_sf_hdr *sfhp);
 extern int xfs_dir2_block_to_sf(struct xfs_da_args *args, struct xfs_buf *bp,

diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c
index 5a104d0eea94187f14bd381db0cb89751089d50a..6913c7d4a7be221e9550d316769b6b6e9505ddb4 100644 (file)
--- a/libxfs/xfs_dir2_sf.c
+++ b/libxfs/xfs_dir2_sf.c
@@ -125,7 +125,7 @@ xfs_dir2_block_sfsize(
         */
        sfhp->count = count;
        sfhp->i8count = i8count;
-       dp->d_ops->sf_put_parent_ino(sfhp, parent);
+       xfs_dir2_sf_put_parent_ino(sfhp, parent);
        return size;
 }
 
@@ -204,7 +204,7 @@ xfs_dir2_block_to_sf(
                else if (dep->namelen == 2 &&
                         dep->name[0] == '.' && dep->name[1] == '.')
                        ASSERT(be64_to_cpu(dep->inumber) ==
-                              dp->d_ops->sf_get_parent_ino(sfp));
+                              xfs_dir2_sf_get_parent_ino(sfp));
                /*
                 * Normal entry, copy it into shortform.
                 */
@@ -584,7 +584,7 @@ xfs_dir2_sf_check(
 
        sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data;
        offset = dp->d_ops->data_first_offset;
-       ino = dp->d_ops->sf_get_parent_ino(sfp);
+       ino = xfs_dir2_sf_get_parent_ino(sfp);
        i8count = ino > XFS_DIR2_MAX_SHORT_INUM;
 
        for (i = 0, sfep = xfs_dir2_sf_firstentry(sfp);
@@ -647,7 +647,7 @@ xfs_dir2_sf_verify(
        endp = (char *)sfp + size;
 
        /* Check .. entry */
-       ino = dops->sf_get_parent_ino(sfp);
+       ino = xfs_dir2_sf_get_parent_ino(sfp);
        i8count = ino > XFS_DIR2_MAX_SHORT_INUM;
        error = xfs_dir_ino_validate(mp, ino);
        if (error)
@@ -757,7 +757,7 @@ xfs_dir2_sf_create(
        /*
         * Now can put in the inode number, since i8count is set.
         */
-       dp->d_ops->sf_put_parent_ino(sfp, pino);
+       xfs_dir2_sf_put_parent_ino(sfp, pino);
        sfp->count = 0;
        dp->i_d.di_size = size;
        xfs_dir2_sf_check(args);
@@ -806,7 +806,7 @@ xfs_dir2_sf_lookup(
         */
        if (args->namelen == 2 &&
            args->name[0] == '.' && args->name[1] == '.') {
-               args->inumber = dp->d_ops->sf_get_parent_ino(sfp);
+               args->inumber = xfs_dir2_sf_get_parent_ino(sfp);
                args->cmpresult = XFS_CMP_EXACT;
                args->filetype = XFS_DIR3_FT_DIR;
                return -EEXIST;
@@ -984,9 +984,9 @@ xfs_dir2_sf_replace(
         */
        if (args->namelen == 2 &&
            args->name[0] == '.' && args->name[1] == '.') {
-               ino = dp->d_ops->sf_get_parent_ino(sfp);
+               ino = xfs_dir2_sf_get_parent_ino(sfp);
                ASSERT(args->inumber != ino);
-               dp->d_ops->sf_put_parent_ino(sfp, args->inumber);
+               xfs_dir2_sf_put_parent_ino(sfp, args->inumber);
        }
        /*
         * Normal entry, look for the name.
@@ -1092,7 +1092,7 @@ xfs_dir2_sf_toino4(
         */
        sfp->count = oldsfp->count;
        sfp->i8count = 0;
-       dp->d_ops->sf_put_parent_ino(sfp, dp->d_ops->sf_get_parent_ino(oldsfp));
+       xfs_dir2_sf_put_parent_ino(sfp, xfs_dir2_sf_get_parent_ino(oldsfp));
        /*
         * Copy the entries field by field.
         */
@@ -1165,7 +1165,7 @@ xfs_dir2_sf_toino8(
         */
        sfp->count = oldsfp->count;
        sfp->i8count = 1;
-       dp->d_ops->sf_put_parent_ino(sfp, dp->d_ops->sf_get_parent_ino(oldsfp));
+       xfs_dir2_sf_put_parent_ino(sfp, xfs_dir2_sf_get_parent_ino(oldsfp));
        /*
         * Copy the entries field by field.
         */

diff --git a/repair/dir2.c b/repair/dir2.c
index 47f9e036ed54bbcb98f425269a54faf74416c99f..3ae912ff12f6886d8112d5aa32afb35a4b48ffa4 100644 (file)
--- a/repair/dir2.c
+++ b/repair/dir2.c
@@ -84,8 +84,8 @@ process_sf_dir2_fixi8(
        memmove(oldsfp, newsfp, oldsize);
        newsfp->count = oldsfp->count;
        newsfp->i8count = 0;
-       ino = M_DIROPS(mp)->sf_get_parent_ino(sfp);
-       M_DIROPS(mp)->sf_put_parent_ino(newsfp, ino);
+       ino = libxfs_dir2_sf_get_parent_ino(sfp);
+       libxfs_dir2_sf_put_parent_ino(newsfp, ino);
        oldsfep = xfs_dir2_sf_firstentry(oldsfp);
        newsfep = xfs_dir2_sf_firstentry(newsfp);
        while ((int)((char *)oldsfep - (char *)oldsfp) < oldsize) {
@@ -179,7 +179,7 @@ process_sf_dir2(
        /*
         * Initialize i8 based on size of parent inode number.
         */
-       i8 = (M_DIROPS(mp)->sf_get_parent_ino(sfp) > XFS_DIR2_MAX_SHORT_INUM);
+       i8 = (libxfs_dir2_sf_get_parent_ino(sfp) > XFS_DIR2_MAX_SHORT_INUM);
 
        /*
         * check for bad entry count
@@ -479,7 +479,7 @@ _("corrected entry offsets in directory %" PRIu64 "\n"),
        /*
         * check parent (..) entry
         */
-       *parent = M_DIROPS(mp)->sf_get_parent_ino(sfp);
+       *parent = libxfs_dir2_sf_get_parent_ino(sfp);
 
        /*
         * if parent entry is bogus, null it out.  we'll fix it later .
@@ -495,7 +495,7 @@ _("bogus .. inode number (%" PRIu64 ") in directory inode %" PRIu64 ", "),
                if (!no_modify)  {
                        do_warn(_("clearing inode number\n"));
 
-                       M_DIROPS(mp)->sf_put_parent_ino(sfp, zero);
+                       libxfs_dir2_sf_put_parent_ino(sfp, zero);
                        *dino_dirty = 1;
                        *repair = 1;
                } else  {
@@ -510,7 +510,7 @@ _("bogus .. inode number (%" PRIu64 ") in directory inode %" PRIu64 ", "),
 _("corrected root directory %" PRIu64 " .. entry, was %" PRIu64 ", now %" PRIu64 "\n"),
                                ino, *parent, ino);
                        *parent = ino;
-                       M_DIROPS(mp)->sf_put_parent_ino(sfp, ino);
+                       libxfs_dir2_sf_put_parent_ino(sfp, ino);
                        *dino_dirty = 1;
                        *repair = 1;
                } else  {
@@ -530,7 +530,7 @@ _("bad .. entry in directory inode %" PRIu64 ", points to self, "),
                if (!no_modify)  {
                        do_warn(_("clearing inode number\n"));
 
-                       M_DIROPS(mp)->sf_put_parent_ino(sfp, zero);
+                       libxfs_dir2_sf_put_parent_ino(sfp, zero);
                        *dino_dirty = 1;
                        *repair = 1;
                } else  {

diff --git a/repair/phase6.c b/repair/phase6.c
index 0c2047ff6b6cb1e1fde118e94f4c871a4dbe2565..62ad8ffbf2bf8b61b437cda5a234d32d6dacd4ab 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -38,7 +38,6 @@ phase6_verify_dir(
        struct xfs_inode                *ip)
 {
        struct xfs_mount                *mp = ip->i_mount;
-       const struct xfs_dir_ops        *dops;
        struct xfs_ifork                *ifp;
        struct xfs_dir2_sf_hdr          *sfp;
        xfs_failaddr_t                  fa;
@@ -46,8 +45,6 @@ phase6_verify_dir(
        bool                            parent_bypass = false;
        int                             size;
 
-       dops = libxfs_dir_get_ops(mp, NULL);
-
        ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);
        sfp = (struct xfs_dir2_sf_hdr *)ifp->if_u1.if_data;
        size = ifp->if_bytes;
@@ -59,9 +56,9 @@ phase6_verify_dir(
         */
        if (size > offsetof(struct xfs_dir2_sf_hdr, parent) &&
            size >= xfs_dir2_sf_hdr_size(sfp->i8count)) {
-               old_parent = dops->sf_get_parent_ino(sfp);
+               old_parent = libxfs_dir2_sf_get_parent_ino(sfp);
                if (old_parent == 0) {
-                       dops->sf_put_parent_ino(sfp, mp->m_sb.sb_rootino);
+                       libxfs_dir2_sf_put_parent_ino(sfp, mp->m_sb.sb_rootino);
                        parent_bypass = true;
                }
        }
@@ -70,7 +67,7 @@ phase6_verify_dir(
 
        /* Put it back. */
        if (parent_bypass)
-               dops->sf_put_parent_ino(sfp, old_parent);
+               libxfs_dir2_sf_put_parent_ino(sfp, old_parent);
 
        return fa;
 }
@@ -2560,7 +2557,7 @@ shortform_dir2_entry_check(xfs_mount_t    *mp,
                        do_warn(
        _("setting .. in sf dir inode %" PRIu64 " to %" PRIu64 "\n"),
                                ino, parent);
-                       M_DIROPS(mp)->sf_put_parent_ino(sfp, parent);
+                       libxfs_dir2_sf_put_parent_ino(sfp, parent);
                        *ino_dirty = 1;
                }
                return;
@@ -2577,7 +2574,7 @@ shortform_dir2_entry_check(xfs_mount_t    *mp,
        /*
         * Initialise i8 counter -- the parent inode number counts as well.
         */
-       i8 = M_DIROPS(mp)->sf_get_parent_ino(sfp) > XFS_DIR2_MAX_SHORT_INUM;
+       i8 = libxfs_dir2_sf_get_parent_ino(sfp) > XFS_DIR2_MAX_SHORT_INUM;
 
        /*
         * now run through entries, stop at first bad entry, don't need