xfs
[Top] [All Lists]

[PATCH 2/5] xfs: remove inst_t

To: xfs@xxxxxxxxxxx
Subject: [PATCH 2/5] xfs: remove inst_t
From: Christoph Hellwig <hch@xxxxxx>
Date: Wed, 17 Jun 2015 12:55:29 +0200
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1434538532-6566-1-git-send-email-hch@xxxxxx>
References: <1434538532-6566-1-git-send-email-hch@xxxxxx>
We can simply use a void pointer to pass a long return addresses in the
debugging helpers.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
 fs/xfs/xfs_error.c | 4 ++--
 fs/xfs/xfs_error.h | 4 ++--
 fs/xfs/xfs_linux.h | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 338e50b..74d0e59 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -127,7 +127,7 @@ xfs_error_report(
        struct xfs_mount        *mp,
        const char              *filename,
        int                     linenum,
-       inst_t                  *ra)
+       void                    *ra)
 {
        if (level <= xfs_error_level) {
                xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT,
@@ -146,7 +146,7 @@ xfs_corruption_error(
        void                    *p,
        const char              *filename,
        int                     linenum,
-       inst_t                  *ra)
+       void                    *ra)
 {
        if (level <= xfs_error_level)
                xfs_hex_dump(p, 64);
diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
index c0394ed..4ed3042 100644
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
@@ -21,10 +21,10 @@
 struct xfs_mount;
 
 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,
                        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);
 
 #define        XFS_ERROR_REPORT(e, lvl, mp)    \
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 1637a95..3f48263 100644
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -32,8 +32,6 @@ typedef unsigned int          __uint32_t;
 typedef signed long long int   __int64_t;
 typedef unsigned long long int __uint64_t;
 
-typedef __uint32_t             inst_t;         /* an instruction */
-
 typedef __s64                  xfs_off_t;      /* <file offset> type */
 typedef unsigned long long     xfs_ino_t;      /* <inode> type */
 typedef __s64                  xfs_daddr_t;    /* <disk address> type */
-- 
1.9.1

<Prev in Thread] Current Thread [Next in Thread>