xfs: devirtualize ->data_get_ftype and ->data_put_ftype

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>

diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c
index b9f9fbf7eee2aa4a771210b94a015ef6303c0e70..498363ac193d43e667a485b22991227a32476ccd 100644 (file)
--- a/fs/xfs/libxfs/xfs_da_format.c
+++ b/fs/xfs/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/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
index b50273b2d9706b8e2b6c923295364437abebd99e..b44c64a20f670324fd09ee74b687af0450d4b287 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2.h
+++ b/fs/xfs/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/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c
index 62b3adb012106d9872f56b3e8bdbd5c4fea646e6..0c481e55c981009d6fd4fc24956f7f14f39836e6 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2_block.c
+++ b/fs/xfs/libxfs/xfs_dir2_block.c
@@ -541,7 +541,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);
        /*
@@ -633,7 +633,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;
@@ -865,7 +865,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;
@@ -1145,7 +1145,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);
@@ -1160,7 +1160,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);
@@ -1210,7 +1210,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/fs/xfs/libxfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c
index 6ed9396225e322d8d8cbbdbc6ea9a06e853e95bc..0aa1d165c9644ab0ff9b61b51df54b142f31773f 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2_data.c
+++ b/fs/xfs/libxfs/xfs_dir2_data.c
@@ -47,6 +47,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
@@ -88,21 +116,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;
@@ -206,7 +225,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/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c
index 7fa485cd01588995fa8017cc817c07daadb48a77..bc301c973450a5f7ef29c9725e86d921dc1a8467 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2_leaf.c
+++ b/fs/xfs/libxfs/xfs_dir2_leaf.c
@@ -865,7 +865,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);
        /*
@@ -1195,7 +1195,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);
@@ -1526,7 +1526,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/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
index 76d19b522e923af002020f174ff5ddcd5a90c370..4ac7518b667dd7ec80d0cc704a95b69d6ab7a1a3 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2_node.c
+++ b/fs/xfs/libxfs/xfs_dir2_node.c
@@ -884,7 +884,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;
@@ -1969,7 +1969,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);
@@ -2253,7 +2253,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/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h
index 0a18cf7023a04c85953467cc74ddfe99d134aedf..a22222df4bf235c0ef900bbc991cbf0cd3f42abe 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2_priv.h
+++ b/fs/xfs/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/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c
index b5ac27442f9a82a7312822096426a644bf5bb596..db1a82972d9e8cf75552be45de7557035967ca13 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2_sf.c
+++ b/fs/xfs/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/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
index a893d2d0962038cb2a57e65b3f4cab50e27f93d7..b149cb4a4d86015e016a2e58086a98aad7c6027f 100644 (file)
--- a/fs/xfs/xfs_dir2_readdir.c
+++ b/fs/xfs/xfs_dir2_readdir.c
@@ -203,7 +203,7 @@ xfs_dir2_block_getdents(
                cook = xfs_dir2_db_off_to_dataptr(geo, geo->datablk, offset);
 
                ctx->pos = cook & 0x7fffffff;
-               filetype = dp->d_ops->data_get_ftype(dep);
+               filetype = xfs_dir2_data_get_ftype(dp->i_mount, dep);
                /*
                 * If it didn't fit, set the final offset to here & return.
                 */
@@ -456,7 +456,7 @@ xfs_dir2_leaf_getdents(
 
                dep = bp->b_addr + offset;
                length = xfs_dir2_data_entsize(mp, dep->namelen);
-               filetype = dp->d_ops->data_get_ftype(dep);
+               filetype = xfs_dir2_data_get_ftype(mp, dep);
 
                ctx->pos = xfs_dir2_byte_to_dataptr(curoff) & 0x7fffffff;
                if (!xfs_dir2_namecheck(dep->name, dep->namelen)) {