xfs: removed unused typedef definitions and symbols
cover xfs: removed unused typedef definitions and symbols
After seeing Christoph's m_chsize removal I figured I'd go look for more. ;)
patch1 removes some typedef'd structure types that are no longer referred to by the typedefs
patch2 removes some more unused symbols
PATCH 1/2 xfs: removed unused typedef definitions
Remove some typdefs for type_t's that are no longer referred to by their typedef'd types.
---
fs/xfs/libxfs/xfs_format.h +2 -2
@@ -920,13 +920,13 @@ static inline uint xfs_dinode_size(int version)* This enum is used in string mapping in xfs_trace.h; please keep the * TRACE_DEFINE_ENUMs for it up to date. */ -typedef enum xfs_dinode_fmt { +enum xfs_dinode_fmt {XFS_DINODE_FMT_DEV ,/* xfs_dev_t */ XFS_DINODE_FMT_LOCAL ,/* bulk data */ XFS_DINODE_FMT_EXTENTS ,/* struct xfs_bmbt_rec */ XFS_DINODE_FMT_BTREE ,/* struct xfs_bmdr_block */ XFS_DINODE_FMT_UUID /* added long ago, but never used */ -}xfs_dinode_fmt_t ; +};#define XFS_INODE_FORMAT_STR \ { XFS_DINODE_FMT_DEV, "dev" }, \
fs/xfs/libxfs/xfs_log_recover.h +2 -2
@@ -30,14 +30,14 @@ typedef struct xlog_recover_item {xfs_log_iovec_t *ri_buf;/* ptr to regions buffer */ } xlog_recover_item_t; -typedef struct xlog_recover { +struct xlog_recover {struct hlist_node r_list;xlog_tid_t r_log_tid;/* log's transaction id */ xfs_trans_header_t r_theader;/* trans header for partial */ int r_state;/* not needed */ xfs_lsn_t r_lsn;/* xact lsn */ struct list_head r_itemq;/* q for items */ -}xlog_recover_t ; +};#define ITEM_TYPE (i) (*(unsigned short *)(i)->ri_buf[0].i_addr)
fs/xfs/xfs_ioctl32.h +2 -2
@@ -99,7 +99,7 @@ typedef struct compat_xfs_fsop_handlereq { _IOWR('X', 108, struct compat_xfs_fsop_handlereq) /* The bstat field in the swapext struct needs translation */ -typedef struct compat_xfs_swapext { +struct compat_xfs_swapext {int64_t sx_version;/* version */ int64_t sx_fdtarget;/* fd of target file */ int64_t sx_fdtmp;/* fd of tmp file */
@@ -107,7 +107,7 @@ typedef struct compat_xfs_swapext {xfs_off_t sx_length;/* leng from offset */ char sx_pad[16 ];/* pad space, unused */ struct compat_xfs_bstat sx_stat;/* stat of target b4 copy */ -}__compat_packed compat_xfs_swapext_t; +} __compat_packed;#define XFS_IOC_SWAPEXT_32 _IOWR('X', 109, struct compat_xfs_swapext)
Re: [PATCH 1/2] xfs: removed unused typedef definitions
Quoted 4 lines · Eric Sandeen
Remove some typdefs for type_t's that are no longer referred to by their typedef'd types.
Signed-off-by Eric Sandeen <[email protected]>
Looks ok, have fun cleaning them out of xfsprogs. ;)
--D
Quoted 67 lines
---
fs/xfs/libxfs/xfs_format.h +2
-2@@ -920,13 +920,13 @@ static inline uint xfs_dinode_size(int version)* This enum is used in string mapping in xfs_trace.h; please keep the * TRACE_DEFINE_ENUMs for it up to date. */ -typedef enum xfs_dinode_fmt { +enum xfs_dinode_fmt {XFS_DINODE_FMT_DEV ,/* xfs_dev_t */ XFS_DINODE_FMT_LOCAL ,/* bulk data */ XFS_DINODE_FMT_EXTENTS ,/* struct xfs_bmbt_rec */ XFS_DINODE_FMT_BTREE ,/* struct xfs_bmdr_block */ XFS_DINODE_FMT_UUID /* added long ago, but never used */ -}xfs_dinode_fmt_t ; +};#define XFS_INODE_FORMAT_STR \ { XFS_DINODE_FMT_DEV, "dev" }, \fs/xfs/libxfs/xfs_log_recover.h +2
-2@@ -30,14 +30,14 @@ typedef struct xlog_recover_item {xfs_log_iovec_t *ri_buf;/* ptr to regions buffer */ } xlog_recover_item_t; -typedef struct xlog_recover { +struct xlog_recover {struct hlist_node r_list;xlog_tid_t r_log_tid;/* log's transaction id */ xfs_trans_header_t r_theader;/* trans header for partial */ int r_state;/* not needed */ xfs_lsn_t r_lsn;/* xact lsn */ struct list_head r_itemq;/* q for items */ -}xlog_recover_t ; +};#define ITEM_TYPE (i) (*(unsigned short *)(i)->ri_buf[0].i_addr)fs/xfs/xfs_ioctl32.h +2
-2@@ -99,7 +99,7 @@ typedef struct compat_xfs_fsop_handlereq { _IOWR('X', 108, struct compat_xfs_fsop_handlereq) /* The bstat field in the swapext struct needs translation */ -typedef struct compat_xfs_swapext { +struct compat_xfs_swapext {int64_t sx_version;/* version */ int64_t sx_fdtarget;/* fd of target file */ int64_t sx_fdtmp;/* fd of tmp file */ @@ -107,7 +107,7 @@ typedef struct compat_xfs_swapext {xfs_off_t sx_length;/* leng from offset */ char sx_pad[16 ];/* pad space, unused */ struct compat_xfs_bstat sx_stat;/* stat of target b4 copy */ -}__compat_packed compat_xfs_swapext_t; +} __compat_packed;#define XFS_IOC_SWAPEXT_32 _IOWR('X', 109, struct compat_xfs_swapext)
PATCH 2/2 xfs: remove unused structure members & simple typedefs
In reply to Eric SandeenRemove some unused typedef'd simple types, and some unused structure members.
---
fs/xfs/libxfs/xfs_types.h +0 -2
@@ -21,7 +21,6 @@ typedef int32_t xfs_suminfo_t; /* type of bitmap summary info */typedef uint32_t xfs_rtword_t ;/* word type for bitmap manipulations */ typedef int64_t xfs_lsn_t ;/* log sequence number */ -typedef int32_t xfs_tid_t ;/* transaction identifier */ typedef uint32_t xfs_dablk_t ;/* dir/attr block number (in file) */ typedef uint32_t xfs_dahash_t ;/* dir/attr hash value */
@@ -33,7 +32,6 @@ typedef uint64_t xfs_fileoff_t; /* block number in a file */typedef uint64_t xfs_filblks_t ;/* number of blocks in a file */ typedef int64_t xfs_srtblock_t ;/* signed version of xfs_rtblock_t */ -typedef int64_t xfs_sfiloff_t ;/* signed block number in a file */ /* * New verifiers will return the instruction address of the failing check.
fs/xfs/xfs_log_priv.h +0 -2
@@ -399,8 +399,6 @@ struct xlog {/* The following field are used for debugging; need to hold icloglock */ #ifdef DEBUG void *l_iclog_bak[XLOG_MAX_ICLOGS ]; -/* log record crc error injection factor */ -uint32_t l_badcrc_factor;#endif /* log recovery lsn tracking (for buffer submission */ xfs_lsn_t l_recovery_lsn;
fs/xfs/xfs_mount.h +0 -1
@@ -59,7 +59,6 @@ struct xfs_error_cfg { typedef struct xfs_mount { struct super_block *m_super; - xfs_tid_t m_tid; /* next unused tid for fs */ /* * Bitsets of per-fs metadata that have been checked and/or are sick.
Re: [PATCH 2/2] xfs: remove unused structure members & simple typedefs
Quoted 4 lines · Eric Sandeen
Remove some unused typedef'd simple types, and some unused structure members.
Signed-off-by Eric Sandeen <[email protected]>
Looks ok,
--D
Quoted 49 lines
---
fs/xfs/libxfs/xfs_types.h +0
-2@@ -21,7 +21,6 @@ typedef int32_t xfs_suminfo_t; /* type of bitmap summary info */typedef uint32_t xfs_rtword_t ;/* word type for bitmap manipulations */ typedef int64_t xfs_lsn_t ;/* log sequence number */ -typedef int32_t xfs_tid_t ;/* transaction identifier */ typedef uint32_t xfs_dablk_t ;/* dir/attr block number (in file) */ typedef uint32_t xfs_dahash_t ;/* dir/attr hash value */ @@ -33,7 +32,6 @@ typedef uint64_t xfs_fileoff_t; /* block number in a file */typedef uint64_t xfs_filblks_t ;/* number of blocks in a file */ typedef int64_t xfs_srtblock_t ;/* signed version of xfs_rtblock_t */ -typedef int64_t xfs_sfiloff_t ;/* signed block number in a file */ /* * New verifiers will return the instruction address of the failing check. fs/xfs/xfs_log_priv.h +0
-2@@ -399,8 +399,6 @@ struct xlog {/* The following field are used for debugging; need to hold icloglock */ #ifdef DEBUG void *l_iclog_bak[XLOG_MAX_ICLOGS ]; -/* log record crc error injection factor */ -uint32_t l_badcrc_factor;#endif /* log recovery lsn tracking (for buffer submission */ xfs_lsn_t l_recovery_lsn;fs/xfs/xfs_mount.h +0
-1@@ -59,7 +59,6 @@ struct xfs_error_cfg { typedef struct xfs_mount { struct super_block *m_super; - xfs_tid_t m_tid; /* next unused tid for fs */ /* * Bitsets of per-fs metadata that have been checked and/or are sick.