From d5b6e3355d29c246bea3ba4ff4b0d4b79f2a89ff Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sat, 9 May 2020 13:09:31 -0400 Subject: [PATCH] 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 Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- include/xfs_inode.h | 2 -- include/xfs_mount.h | 3 --- libxfs/rdwr.c | 8 -------- libxfs/util.c | 8 -------- repair/phase6.c | 1 - 5 files changed, 22 deletions(-) diff --git a/include/xfs_inode.h b/include/xfs_inode.h index 0ee51f638..3caeeb39e 100644 --- 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 7bd23fbbe..20c8bfaf4 100644 --- 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 3b42d720a..13a414d74 100644 --- 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 73aa547e6..914e4ca58 100644 --- 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 a938e802c..5e3b394a2 100644 --- 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); -- 2.47.2