xfsprogs: remove xfs_dir_ops

The xfs_dir_ops infrastructure has been removed a while ago.  Remove
a few always empty members in xfsprogs to finish the cleanup.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index 0ee51f63883d51037016b5492df45288ab0d5bb8..3caeeb39ed6cbbdea61fa0866bd510cc95a620c4 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -14,7 +14,6 @@
 struct xfs_trans;
 struct xfs_mount;
 struct xfs_inode_log_item;
-struct xfs_dir_ops;
 
 /*
  * These are not actually used, they are only for userspace build
@@ -79,7 +78,6 @@ typedef struct xfs_inode {
        unsigned int            i_cformat;      /* format of cow fork */
 
        xfs_fsize_t             i_size;         /* in-memory size */
-       const struct xfs_dir_ops *d_ops;        /* directory ops vector */
        struct xfs_ifork_ops    *i_fork_ops;    /* fork verifiers */
        struct inode            i_vnode;
 } xfs_inode_t;

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index 7bd23fbbe50f305a98672f55e8f8f747f67ec6d0..20c8bfaf4fa8856aa29dfb0fdf61b6755cf288b4 100644 (file)
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -9,7 +9,6 @@
 
 struct xfs_inode;
 struct xfs_buftarg;
-struct xfs_dir_ops;
 struct xfs_da_geometry;
 
 /*
@@ -87,8 +86,6 @@ typedef struct xfs_mount {
 
        struct xfs_da_geometry  *m_dir_geo;     /* directory block geometry */
        struct xfs_da_geometry  *m_attr_geo;    /* attribute block geometry */
-       const struct xfs_dir_ops *m_dir_inode_ops; /* vector of dir inode ops */
-       const struct xfs_dir_ops *m_nondir_inode_ops; /* !dir inode ops */
 
        /*
         * anonymous struct to allow xfs_dquot_buf.c to compile.

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 3b42d720a088f1b8e9ef147cb2d335a073a32bd7..13a414d74824cd3984c1c578c63e700fe0699fc0 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -1287,14 +1287,6 @@ libxfs_iget(
                return -EFSCORRUPTED;
        }
 
-       /*
-        * set up the inode ops structure that the libxfs code relies on
-        */
-       if (XFS_ISDIR(ip))
-               ip->d_ops = mp->m_dir_inode_ops;
-       else
-               ip->d_ops = mp->m_nondir_inode_ops;
-
        *ipp = ip;
        return 0;
 }

diff --git a/libxfs/util.c b/libxfs/util.c
index 73aa547e6015bc2f3bf4d0e4dbcc16da3f0f2892..914e4ca588ee6399dab0023df6e939cf927f4b98 100644 (file)
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -337,14 +337,6 @@ libxfs_ialloc(
        ip->i_d.di_aformat = XFS_DINODE_FMT_EXTENTS;
        ip->i_d.di_anextents = 0;
 
-       /*
-        * set up the inode ops structure that the libxfs code relies on
-        */
-       if (XFS_ISDIR(ip))
-               ip->d_ops = ip->i_mount->m_dir_inode_ops;
-       else
-               ip->d_ops = ip->i_mount->m_nondir_inode_ops;
-
        /*
         * Log the new values stuffed into the inode.
         */

diff --git a/repair/phase6.c b/repair/phase6.c
index a938e802cd9db5923a20a221f009d5c7ecb55b94..5e3b394a2efce5655945df24d783ae449e46fd37 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -908,7 +908,6 @@ mk_root_dir(xfs_mount_t *mp)
        /*
         * initialize the directory
         */
-       ip->d_ops = mp->m_dir_inode_ops;
        libxfs_dir_init(tp, ip, ip);
 
        error = -libxfs_trans_commit(tp);