瀏覽代碼

xfs: remove inst_t

We can simply use a void pointer to pass a long return addresses in the
debugging helpers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Christoph Hellwig 10 年之前
父節點
當前提交
fc51c2b5f8
共有 3 個文件被更改,包括 4 次插入6 次删除
  1. 2 2
      fs/xfs/xfs_error.c
  2. 2 2
      fs/xfs/xfs_error.h
  3. 0 2
      fs/xfs/xfs_linux.h

+ 2 - 2
fs/xfs/xfs_error.c

@@ -127,7 +127,7 @@ xfs_error_report(
 	struct xfs_mount	*mp,
 	struct xfs_mount	*mp,
 	const char		*filename,
 	const char		*filename,
 	int			linenum,
 	int			linenum,
-	inst_t			*ra)
+	void			*ra)
 {
 {
 	if (level <= xfs_error_level) {
 	if (level <= xfs_error_level) {
 		xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT,
 		xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT,
@@ -146,7 +146,7 @@ xfs_corruption_error(
 	void			*p,
 	void			*p,
 	const char		*filename,
 	const char		*filename,
 	int			linenum,
 	int			linenum,
-	inst_t			*ra)
+	void			*ra)
 {
 {
 	if (level <= xfs_error_level)
 	if (level <= xfs_error_level)
 		xfs_hex_dump(p, 64);
 		xfs_hex_dump(p, 64);

+ 2 - 2
fs/xfs/xfs_error.h

@@ -21,10 +21,10 @@
 struct xfs_mount;
 struct xfs_mount;
 
 
 extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp,
 extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp,
-			const char *filename, int linenum, inst_t *ra);
+			const char *filename, int linenum, void *ra);
 extern void xfs_corruption_error(const char *tag, int level,
 extern void xfs_corruption_error(const char *tag, int level,
 			struct xfs_mount *mp, void *p, const char *filename,
 			struct xfs_mount *mp, void *p, const char *filename,
-			int linenum, inst_t *ra);
+			int linenum, void *ra);
 extern void xfs_verifier_error(struct xfs_buf *bp);
 extern void xfs_verifier_error(struct xfs_buf *bp);
 
 
 #define	XFS_ERROR_REPORT(e, lvl, mp)	\
 #define	XFS_ERROR_REPORT(e, lvl, mp)	\

+ 0 - 2
fs/xfs/xfs_linux.h

@@ -32,8 +32,6 @@ typedef unsigned int		__uint32_t;
 typedef signed long long int	__int64_t;
 typedef signed long long int	__int64_t;
 typedef unsigned long long int	__uint64_t;
 typedef unsigned long long int	__uint64_t;
 
 
-typedef __uint32_t		inst_t;		/* an instruction */
-
 typedef __s64			xfs_off_t;	/* <file offset> type */
 typedef __s64			xfs_off_t;	/* <file offset> type */
 typedef unsigned long long	xfs_ino_t;	/* <inode> type */
 typedef unsigned long long	xfs_ino_t;	/* <inode> type */
 typedef __s64			xfs_daddr_t;	/* <disk address> type */
 typedef __s64			xfs_daddr_t;	/* <disk address> type */