From 6908be48fed56a1c70ae0a88bb31ca3dd48cf40f Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 22 Jan 2020 11:29:43 -0500 Subject: [PATCH] xfs: remove the now unused dir ops infrastructure Source kernel commit: 957ee13e204a5ffe814139aa89e62eece4b969fd Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- include/xfs_mount.h | 1 - libxfs/Makefile | 1 - libxfs/libxfs_api_defs.h | 1 - libxfs/xfs_da_btree.h | 1 - libxfs/xfs_da_format.c | 46 ---------------------------------------- libxfs/xfs_dir2.c | 2 -- libxfs/xfs_dir2.h | 9 -------- 7 files changed, 61 deletions(-) delete mode 100644 libxfs/xfs_da_format.c diff --git a/include/xfs_mount.h b/include/xfs_mount.h index efbf3aff9..29b3cc1b2 100644 --- a/include/xfs_mount.h +++ b/include/xfs_mount.h @@ -89,7 +89,6 @@ typedef struct xfs_mount { 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 */ -#define M_DIROPS(mp) ((mp)->m_dir_inode_ops) /* * anonymous struct to allow xfs_dquot_buf.c to compile. diff --git a/libxfs/Makefile b/libxfs/Makefile index 8c681e0b9..fbcc963a5 100644 --- a/libxfs/Makefile +++ b/libxfs/Makefile @@ -71,7 +71,6 @@ CFILES = cache.c \ xfs_bmap_btree.c \ xfs_btree.c \ xfs_da_btree.c \ - xfs_da_format.c \ xfs_defer.c \ xfs_dir2.c \ xfs_dir2_block.c \ diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h index 4f45c0be6..73adc644d 100644 --- a/libxfs/libxfs_api_defs.h +++ b/libxfs/libxfs_api_defs.h @@ -159,7 +159,6 @@ #define xfs_agfl_size libxfs_agfl_size #define xfs_refc_block libxfs_refc_block #define xfs_rmap_compare libxfs_rmap_compare -#define xfs_dir_get_ops libxfs_dir_get_ops #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 diff --git a/libxfs/xfs_da_btree.h b/libxfs/xfs_da_btree.h index 4ac2cc87c..5af4df71e 100644 --- a/libxfs/xfs_da_btree.h +++ b/libxfs/xfs_da_btree.h @@ -10,7 +10,6 @@ struct xfs_inode; struct xfs_trans; struct zone; -struct xfs_dir_ops; /* * Directory/attribute geometry information. There will be one of these for each diff --git a/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c deleted file mode 100644 index fb1674c3c..000000000 --- a/libxfs/xfs_da_format.c +++ /dev/null @@ -1,46 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2000,2002,2005 Silicon Graphics, Inc. - * Copyright (c) 2013 Red Hat, Inc. - * All Rights Reserved. - */ -#include "libxfs_priv.h" -#include "xfs_fs.h" -#include "xfs_shared.h" -#include "xfs_format.h" -#include "xfs_log_format.h" -#include "xfs_trans_resv.h" -#include "xfs_mount.h" -#include "xfs_inode.h" -#include "xfs_dir2.h" -#include "xfs_dir2_priv.h" - -static const struct xfs_dir_ops xfs_dir2_ops = { -}; - -static const struct xfs_dir_ops xfs_dir2_ftype_ops = { -}; - -static const struct xfs_dir_ops xfs_dir3_ops = { -}; - -/* - * Return the ops structure according to the current config. If we are passed - * an inode, then that overrides the default config we use which is based on - * feature bits. - */ -const struct xfs_dir_ops * -xfs_dir_get_ops( - struct xfs_mount *mp, - struct xfs_inode *dp) -{ - if (dp) - return dp->d_ops; - if (mp->m_dir_inode_ops) - return mp->m_dir_inode_ops; - if (xfs_sb_version_hascrc(&mp->m_sb)) - return &xfs_dir3_ops; - if (xfs_sb_version_hasftype(&mp->m_sb)) - return &xfs_dir2_ftype_ops; - return &xfs_dir2_ops; -} diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c index 4e30d8770..f340eecbf 100644 --- a/libxfs/xfs_dir2.c +++ b/libxfs/xfs_dir2.c @@ -102,8 +102,6 @@ xfs_da_mount( ASSERT(mp->m_sb.sb_versionnum & XFS_SB_VERSION_DIRV2BIT); ASSERT(xfs_dir2_dirblock_bytes(&mp->m_sb) <= XFS_MAX_BLOCKSIZE); - mp->m_dir_inode_ops = xfs_dir_get_ops(mp, NULL); - mp->m_dir_geo = kmem_zalloc(sizeof(struct xfs_da_geometry), KM_MAYFAIL); mp->m_attr_geo = kmem_zalloc(sizeof(struct xfs_da_geometry), diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h index b44c64a20..a0cd423c7 100644 --- a/libxfs/xfs_dir2.h +++ b/libxfs/xfs_dir2.h @@ -28,15 +28,6 @@ extern struct xfs_name xfs_name_dotdot; */ extern unsigned char xfs_mode_to_ftype(int mode); -/* - * directory operations vector for encode/decode routines - */ -struct xfs_dir_ops { -}; - -extern const struct xfs_dir_ops * - xfs_dir_get_ops(struct xfs_mount *mp, struct xfs_inode *dp); - /* * Generic directory interface routines */ -- 2.50.1