xfs: devirtualize ->data_get_ftype and ->data_put_ftype

Source kernel commit: 59b8b465058ec203493c0436f243263051e08f5a

Replace the ->data_get_ftype and ->data_put_ftype dir ops methods with
directly called xfs_dir2_data_get_ftype and xfs_dir2_data_put_ftype
helpers that takes care of the differences between the directory format
with and without the file type field.

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/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index cef7be331d1d2f89a6ddd7134c9beaaa12a78237..4f45c0be6bd425095f48cda483cee0794de62993 100644 (file)
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -76,6 +76,8 @@
 #define xfs_dir_lookup                 libxfs_dir_lookup
 #define xfs_dir_replace                        libxfs_dir_replace
 #define xfs_dir2_data_bestfree_p       libxfs_dir2_data_bestfree_p
+#define xfs_dir2_data_get_ftype                libxfs_dir2_data_get_ftype
+#define xfs_dir2_data_put_ftype                libxfs_dir2_data_put_ftype
 #define xfs_dir2_leaf_hdr_from_disk    libxfs_dir2_leaf_hdr_from_disk
 #define xfs_dir2_free_hdr_from_disk    libxfs_dir2_free_hdr_from_disk
 #define xfs_dir2_isblock               libxfs_dir2_isblock

diff --git a/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c
index 88759270b93ef0530112a2dbc27118baaa79ee38..fb1674c3c4020e2e2fd872829856f214ee371e77 100644 (file)
--- a/libxfs/xfs_da_format.c
+++ b/libxfs/xfs_da_format.c
@@ -15,60 +15,13 @@
 #include "xfs_dir2.h"
 #include "xfs_dir2_priv.h"
 
-/*
- * Directory data block operations
- */
-
-static uint8_t
-xfs_dir2_data_get_ftype(
-       struct xfs_dir2_data_entry *dep)
-{
-       return XFS_DIR3_FT_UNKNOWN;
-}
-
-static void
-xfs_dir2_data_put_ftype(
-       struct xfs_dir2_data_entry *dep,
-       uint8_t                 ftype)
-{
-       ASSERT(ftype < XFS_DIR3_FT_MAX);
-}
-
-static uint8_t
-xfs_dir3_data_get_ftype(
-       struct xfs_dir2_data_entry *dep)
-{
-       uint8_t         ftype = dep->name[dep->namelen];
-
-       if (ftype >= XFS_DIR3_FT_MAX)
-               return XFS_DIR3_FT_UNKNOWN;
-       return ftype;
-}
-
-static void
-xfs_dir3_data_put_ftype(
-       struct xfs_dir2_data_entry *dep,
-       uint8_t                 type)
-{
-       ASSERT(type < XFS_DIR3_FT_MAX);
-       ASSERT(dep->namelen != 0);
-
-       dep->name[dep->namelen] = type;
-}
-
 static const struct xfs_dir_ops xfs_dir2_ops = {
-       .data_get_ftype = xfs_dir2_data_get_ftype,
-       .data_put_ftype = xfs_dir2_data_put_ftype,
 };
 
 static const struct xfs_dir_ops xfs_dir2_ftype_ops = {
-       .data_get_ftype = xfs_dir3_data_get_ftype,
-       .data_put_ftype = xfs_dir3_data_put_ftype,
 };
 
 static const struct xfs_dir_ops xfs_dir3_ops = {
-       .data_get_ftype = xfs_dir3_data_get_ftype,
-       .data_put_ftype = xfs_dir3_data_put_ftype,
 };
 
 /*

diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h
index b50273b2d9706b8e2b6c923295364437abebd99e..b44c64a20f670324fd09ee74b687af0450d4b287 100644 (file)
--- a/libxfs/xfs_dir2.h
+++ b/libxfs/xfs_dir2.h
@@ -32,9 +32,6 @@ extern unsigned char xfs_mode_to_ftype(int mode);
  * directory operations vector for encode/decode routines
  */
 struct xfs_dir_ops {
-       uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep);
-       void    (*data_put_ftype)(struct xfs_dir2_data_entry *dep,
-                               uint8_t ftype);
 };
 
 extern const struct xfs_dir_ops *

diff --git a/libxfs/xfs_dir2_block.c b/libxfs/xfs_dir2_block.c
index 2a328e0136d749f78a5f4ceac61d90fe8d7fa9f8..35863ca634ad2db193f26704b0fd3620424e1233 100644 (file)
--- a/libxfs/xfs_dir2_block.c
+++ b/libxfs/xfs_dir2_block.c
@@ -538,7 +538,7 @@ xfs_dir2_block_addname(
        dep->inumber = cpu_to_be64(args->inumber);
        dep->namelen = args->namelen;
        memcpy(dep->name, args->name, args->namelen);
-       dp->d_ops->data_put_ftype(dep, args->filetype);
+       xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype);
        tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep);
        *tagp = cpu_to_be16((char *)dep - (char *)hdr);
        /*
@@ -630,7 +630,7 @@ xfs_dir2_block_lookup(
         * Fill in inode number, CI name if appropriate, release the block.
         */
        args->inumber = be64_to_cpu(dep->inumber);
-       args->filetype = dp->d_ops->data_get_ftype(dep);
+       args->filetype = xfs_dir2_data_get_ftype(dp->i_mount, dep);
        error = xfs_dir_cilookup_result(args, dep->name, dep->namelen);
        xfs_trans_brelse(args->trans, bp);
        return error;
@@ -862,7 +862,7 @@ xfs_dir2_block_replace(
         * Change the inode number to the new value.
         */
        dep->inumber = cpu_to_be64(args->inumber);
-       dp->d_ops->data_put_ftype(dep, args->filetype);
+       xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype);
        xfs_dir2_data_log_entry(args, bp, dep);
        xfs_dir3_data_check(dp, bp);
        return 0;
@@ -1142,7 +1142,7 @@ xfs_dir2_sf_to_block(
        dep->inumber = cpu_to_be64(dp->i_ino);
        dep->namelen = 1;
        dep->name[0] = '.';
-       dp->d_ops->data_put_ftype(dep, XFS_DIR3_FT_DIR);
+       xfs_dir2_data_put_ftype(mp, dep, XFS_DIR3_FT_DIR);
        tagp = xfs_dir2_data_entry_tag_p(mp, dep);
        *tagp = cpu_to_be16(offset);
        xfs_dir2_data_log_entry(args, bp, dep);
@@ -1157,7 +1157,7 @@ xfs_dir2_sf_to_block(
        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);
+       xfs_dir2_data_put_ftype(mp, dep, XFS_DIR3_FT_DIR);
        tagp = xfs_dir2_data_entry_tag_p(mp, dep);
        *tagp = cpu_to_be16(offset);
        xfs_dir2_data_log_entry(args, bp, dep);
@@ -1207,7 +1207,8 @@ xfs_dir2_sf_to_block(
                dep = bp->b_addr + newoffset;
                dep->inumber = cpu_to_be64(xfs_dir2_sf_get_ino(mp, sfp, sfep));
                dep->namelen = sfep->namelen;
-               dp->d_ops->data_put_ftype(dep, xfs_dir2_sf_get_ftype(mp, sfep));
+               xfs_dir2_data_put_ftype(mp, dep,
+                               xfs_dir2_sf_get_ftype(mp, sfep));
                memcpy(dep->name, sfep->name, dep->namelen);
                tagp = xfs_dir2_data_entry_tag_p(mp, dep);
                *tagp = cpu_to_be16(newoffset);

diff --git a/libxfs/xfs_dir2_data.c b/libxfs/xfs_dir2_data.c
index 5fc2e2991e23ddc093d813087b5ca768d2d9a326..4697afab564ad1d0cbf3289b6d9cfdda0a53f87b 100644 (file)
--- a/libxfs/xfs_dir2_data.c
+++ b/libxfs/xfs_dir2_data.c
@@ -44,6 +44,34 @@ xfs_dir2_data_entry_tag_p(
                xfs_dir2_data_entsize(mp, dep->namelen) - sizeof(__be16));
 }
 
+uint8_t
+xfs_dir2_data_get_ftype(
+       struct xfs_mount                *mp,
+       struct xfs_dir2_data_entry      *dep)
+{
+       if (xfs_sb_version_hasftype(&mp->m_sb)) {
+               uint8_t                 ftype = dep->name[dep->namelen];
+
+               if (likely(ftype < XFS_DIR3_FT_MAX))
+                       return ftype;
+       }
+
+       return XFS_DIR3_FT_UNKNOWN;
+}
+
+void
+xfs_dir2_data_put_ftype(
+       struct xfs_mount                *mp,
+       struct xfs_dir2_data_entry      *dep,
+       uint8_t                         ftype)
+{
+       ASSERT(ftype < XFS_DIR3_FT_MAX);
+       ASSERT(dep->namelen != 0);
+
+       if (xfs_sb_version_hasftype(&mp->m_sb))
+               dep->name[dep->namelen] = ftype;
+}
+
 /*
  * The number of leaf entries is limited by the size of the block and the amount
  * of space used by the data entries.  We don't know how much space is used by
@@ -85,21 +113,12 @@ __xfs_dir3_data_check(
        struct xfs_name         name;
        unsigned int            offset;
        unsigned int            end;
-       const struct xfs_dir_ops *ops;
        struct xfs_da_geometry  *geo = mp->m_dir_geo;
 
        /*
-        * We can be passed a null dp here from a verifier, so we need to go the
-        * hard way to get them.
-        */
-       ops = xfs_dir_get_ops(mp, dp);
-
-       /*
-        * If this isn't a directory, or we don't get handed the dir ops,
-        * something is seriously wrong.  Bail out.
+        * If this isn't a directory, something is seriously wrong.  Bail out.
         */
-       if ((dp && !S_ISDIR(VFS_I(dp)->i_mode)) ||
-           ops != xfs_dir_get_ops(mp, NULL))
+       if (dp && !S_ISDIR(VFS_I(dp)->i_mode))
                return __this_address;
 
        hdr = bp->b_addr;
@@ -203,7 +222,7 @@ __xfs_dir3_data_check(
                        return __this_address;
                if (be16_to_cpu(*xfs_dir2_data_entry_tag_p(mp, dep)) != offset)
                        return __this_address;
-               if (ops->data_get_ftype(dep) >= XFS_DIR3_FT_MAX)
+               if (xfs_dir2_data_get_ftype(mp, dep) >= XFS_DIR3_FT_MAX)
                        return __this_address;
                count++;
                lastfree = 0;

diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c
index 10fadb42e2e7bd05136e11972b63f21bf3c94231..e2699d822c058696977b75e1b7da2b7ba8861410 100644 (file)
--- a/libxfs/xfs_dir2_leaf.c
+++ b/libxfs/xfs_dir2_leaf.c
@@ -863,7 +863,7 @@ xfs_dir2_leaf_addname(
        dep->inumber = cpu_to_be64(args->inumber);
        dep->namelen = args->namelen;
        memcpy(dep->name, args->name, dep->namelen);
-       dp->d_ops->data_put_ftype(dep, args->filetype);
+       xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype);
        tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep);
        *tagp = cpu_to_be16((char *)dep - (char *)hdr);
        /*
@@ -1193,7 +1193,7 @@ xfs_dir2_leaf_lookup(
         * Return the found inode number & CI name if appropriate
         */
        args->inumber = be64_to_cpu(dep->inumber);
-       args->filetype = dp->d_ops->data_get_ftype(dep);
+       args->filetype = xfs_dir2_data_get_ftype(dp->i_mount, dep);
        error = xfs_dir_cilookup_result(args, dep->name, dep->namelen);
        xfs_trans_brelse(tp, dbp);
        xfs_trans_brelse(tp, lbp);
@@ -1524,7 +1524,7 @@ xfs_dir2_leaf_replace(
         * Put the new inode number in, log it.
         */
        dep->inumber = cpu_to_be64(args->inumber);
-       dp->d_ops->data_put_ftype(dep, args->filetype);
+       xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype);
        tp = args->trans;
        xfs_dir2_data_log_entry(args, dbp, dep);
        xfs_dir3_leaf_check(dp, lbp);

diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c
index 033349e1acdd3edcb297e61d8f09f2e659bf1935..f9f77f2b43e17992140c50258ebe77154a81ccf7 100644 (file)
--- a/libxfs/xfs_dir2_node.c
+++ b/libxfs/xfs_dir2_node.c
@@ -881,7 +881,7 @@ xfs_dir2_leafn_lookup_for_entry(
                                xfs_trans_brelse(tp, state->extrablk.bp);
                        args->cmpresult = cmp;
                        args->inumber = be64_to_cpu(dep->inumber);
-                       args->filetype = dp->d_ops->data_get_ftype(dep);
+                       args->filetype = xfs_dir2_data_get_ftype(mp, dep);
                        *indexp = index;
                        state->extravalid = 1;
                        state->extrablk.bp = curbp;
@@ -1966,7 +1966,7 @@ xfs_dir2_node_addname_int(
        dep->inumber = cpu_to_be64(args->inumber);
        dep->namelen = args->namelen;
        memcpy(dep->name, args->name, dep->namelen);
-       dp->d_ops->data_put_ftype(dep, args->filetype);
+       xfs_dir2_data_put_ftype(dp->i_mount, dep, args->filetype);
        tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep);
        *tagp = cpu_to_be16((char *)dep - (char *)hdr);
        xfs_dir2_data_log_entry(args, dbp, dep);
@@ -2250,7 +2250,7 @@ xfs_dir2_node_replace(
                 * Fill in the new inode number and log the entry.
                 */
                dep->inumber = cpu_to_be64(inum);
-               args->dp->d_ops->data_put_ftype(dep, ftype);
+               xfs_dir2_data_put_ftype(state->mp, dep, ftype);
                xfs_dir2_data_log_entry(args, state->extrablk.bp, dep);
                rval = 0;
        }

diff --git a/libxfs/xfs_dir2_priv.h b/libxfs/xfs_dir2_priv.h
index c80eb6f0ca84b52733c3bbecfdb10815b9cae254..68b9c265dd76b3bc80d7a07d105e8cbf8b128a32 100644 (file)
--- a/libxfs/xfs_dir2_priv.h
+++ b/libxfs/xfs_dir2_priv.h
@@ -61,6 +61,10 @@ struct xfs_dir2_data_free *xfs_dir2_data_bestfree_p(struct xfs_mount *mp,
                struct xfs_dir2_data_hdr *hdr);
 __be16 *xfs_dir2_data_entry_tag_p(struct xfs_mount *mp,
                struct xfs_dir2_data_entry *dep);
+uint8_t xfs_dir2_data_get_ftype(struct xfs_mount *mp,
+               struct xfs_dir2_data_entry *dep);
+void xfs_dir2_data_put_ftype(struct xfs_mount *mp,
+               struct xfs_dir2_data_entry *dep, uint8_t ftype);
 
 #ifdef DEBUG
 extern void xfs_dir3_data_check(struct xfs_inode *dp, struct xfs_buf *bp);

diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c
index 47efddb85ee7698aecee46559bf057aed7526d84..be7464ff4c788625bfa804fa1b8d23c042be6bf3 100644 (file)
--- a/libxfs/xfs_dir2_sf.c
+++ b/libxfs/xfs_dir2_sf.c
@@ -319,7 +319,7 @@ xfs_dir2_block_to_sf(
                        xfs_dir2_sf_put_ino(mp, sfp, sfep,
                                              be64_to_cpu(dep->inumber));
                        xfs_dir2_sf_put_ftype(mp, sfep,
-                                       dp->d_ops->data_get_ftype(dep));
+                                       xfs_dir2_data_get_ftype(mp, dep));
 
                        sfep = xfs_dir2_sf_nextentry(mp, sfp, sfep);
                }

diff --git a/repair/phase6.c b/repair/phase6.c
index 65b3c4048738939a9f7665e3c1203af5a3c1a4ca..09d54f50ed30ce433109e19571424b38fcd5ce6c 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1774,7 +1774,7 @@ longform_dir2_entry_check_data(
                 * check for duplicate names in directory.
                 */
                if (!dir_hash_add(mp, hashtab, addr, inum, dep->namelen,
-                               dep->name, M_DIROPS(mp)->data_get_ftype(dep))) {
+                               dep->name, libxfs_dir2_data_get_ftype(mp, dep))) {
                        nbad++;
                        if (entry_junked(
        _("entry \"%s\" (ino %" PRIu64 ") in dir %" PRIu64 " is a duplicate name"),
@@ -1855,7 +1855,7 @@ longform_dir2_entry_check_data(
                        uint8_t dir_ftype;
                        uint8_t ino_ftype;
 
-                       dir_ftype = M_DIROPS(mp)->data_get_ftype(dep);
+                       dir_ftype = libxfs_dir2_data_get_ftype(mp, dep);
                        ino_ftype = get_inode_ftype(irec, ino_offset);
 
                        if (dir_ftype != ino_ftype) {
@@ -1869,8 +1869,7 @@ longform_dir2_entry_check_data(
        _("fixing ftype mismatch (%d/%d) in directory/child inode %" PRIu64 "/%" PRIu64 "\n"),
                                                dir_ftype, ino_ftype,
                                                ip->i_ino, inum);
-                                       M_DIROPS(mp)->data_put_ftype(dep,
-                                                               ino_ftype);
+                                       libxfs_dir2_data_put_ftype(mp, dep, ino_ftype);
                                        libxfs_dir2_data_log_entry(&da, bp, dep);
                                        dir_hash_update_ftype(hashtab, addr,
                                                              ino_ftype);