xfs: global error sign conversion

[deliverable/linux.git] / fs / xfs / xfs_error.h

diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
index c1c57d4a4b5db6f37a626d7e78a48f32facf8dcd..279a76e52791fcee2bb8d40b4724231dc35d92bb 100644 (file)
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
@@ -18,15 +18,6 @@
 #ifndef        __XFS_ERROR_H__
 #define        __XFS_ERROR_H__
 
-#ifdef DEBUG
-#define        XFS_ERROR_NTRAP 10
-extern int     xfs_etrap[XFS_ERROR_NTRAP];
-extern int     xfs_error_trap(int);
-#define        XFS_ERROR(e)    xfs_error_trap(e)
-#else
-#define        XFS_ERROR(e)    (e)
-#endif
-
 struct xfs_mount;
 
 extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp,
@@ -56,7 +47,7 @@ extern void xfs_verifier_error(struct xfs_buf *bp);
                if (unlikely(!fs_is_ok)) { \
                        XFS_ERROR_REPORT("XFS_WANT_CORRUPTED_GOTO", \
                                         XFS_ERRLEVEL_LOW, NULL); \
-                       error = XFS_ERROR(EFSCORRUPTED); \
+                       error = -EFSCORRUPTED; \
                        goto l; \
                } \
        }
@@ -68,7 +59,7 @@ extern void xfs_verifier_error(struct xfs_buf *bp);
                if (unlikely(!fs_is_ok)) { \
                        XFS_ERROR_REPORT("XFS_WANT_CORRUPTED_RETURN", \
                                         XFS_ERRLEVEL_LOW, NULL); \
-                       return XFS_ERROR(EFSCORRUPTED); \
+                       return -EFSCORRUPTED; \
                } \
        }