[XFS] Remove xfs_macros.c, xfs_macros.h, rework headers a whole lot.

SGI-PV: 943122
SGI-Modid: xfs-linux:xfs-kern:23901a

Signed-off-by: Nathan Scott <nathans@sgi.com>

1 files changed, 38 insertions, 28 deletions

diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
index 52ee2b90b5ed..66eef1beb0e5 100644
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
@@ -54,24 +54,10 @@ extern int	xfs_error_trap(int);
 
 struct xfs_mount;
 
-extern void
-xfs_error_report(
-        char            *tag,
-        int             level,
-        struct xfs_mount *mp,
-        char            *fname,
-        int             linenum,
-        inst_t          *ra);
-
-extern void
-xfs_corruption_error(
-        char            *tag,
-        int             level,
-        struct xfs_mount *mp,
-        void            *p,
-        char            *fname,
-        int             linenum,
-        inst_t          *ra);
+extern void xfs_error_report(char *tag, int level, struct xfs_mount *mp,
+                                char *fname, int linenum, inst_t *ra);
+extern void xfs_corruption_error(char *tag, int level, struct xfs_mount *mp,
+                                void *p, char *fname, int linenum, inst_t *ra);
 
 #define XFS_ERROR_REPORT(e, lvl, mp)    \
         xfs_error_report(e, lvl, mp, __FILE__, __LINE__, __return_address)
@@ -84,6 +70,32 @@ xfs_corruption_error(
 #define XFS_ERRLEVEL_HIGH       5
 
 /*
+ * Macros to set EFSCORRUPTED & return/branch.
+ */
+#define XFS_WANT_CORRUPTED_GOTO(x,l)    \
+        { \
+                int fs_is_ok = (x); \
+                ASSERT(fs_is_ok); \
+                if (unlikely(!fs_is_ok)) { \
+                        XFS_ERROR_REPORT("XFS_WANT_CORRUPTED_GOTO", \
+                                         XFS_ERRLEVEL_LOW, NULL); \
+                        error = XFS_ERROR(EFSCORRUPTED); \
+                        goto l; \
+                } \
+        }
+
+#define XFS_WANT_CORRUPTED_RETURN(x)    \
+        { \
+                int fs_is_ok = (x); \
+                ASSERT(fs_is_ok); \
+                if (unlikely(!fs_is_ok)) { \
+                        XFS_ERROR_REPORT("XFS_WANT_CORRUPTED_RETURN", \
+                                         XFS_ERRLEVEL_LOW, NULL); \
+                        return XFS_ERROR(EFSCORRUPTED); \
+                } \
+        }
+
+/*
  * error injection tags - the labels can be anything you want
  * but each tag should have its own unique number
  */
@@ -139,8 +151,8 @@ xfs_corruption_error(
 #define XFS_RANDOM_BMAPIFORMAT                          XFS_RANDOM_DEFAULT
 
 #if (defined(DEBUG) || defined(INDUCE_IO_ERROR))
-extern int      xfs_error_test(int, int *, char *, int, char *, unsigned long);
-void xfs_error_test_init(void);
+extern int xfs_error_test(int, int *, char *, int, char *, unsigned long);
+extern void xfs_error_test_init(void);
 
 #define XFS_NUM_INJECT_ERROR                            10
 
@@ -156,12 +168,10 @@ void xfs_error_test_init(void);
                         (rf)))
 #endif /* __ANSI_CPP__ */
 
-int             xfs_errortag_add(int error_tag, xfs_mount_t *mp);
-int             xfs_errortag_clear(int error_tag, xfs_mount_t *mp);
-
-int             xfs_errortag_clearall(xfs_mount_t *mp);
-int             xfs_errortag_clearall_umount(int64_t fsid, char *fsname,
-                                                int loud);
+extern int xfs_errortag_add(int error_tag, xfs_mount_t *mp);
+extern int xfs_errortag_clear(int error_tag, xfs_mount_t *mp);
+extern int xfs_errortag_clearall(xfs_mount_t *mp);
+extern int xfs_errortag_clearall_umount(int64_t fsid, char *fsname, int loud);
 #else
 #define XFS_TEST_ERROR(expr, mp, tag, rf)       (expr)
 #define xfs_errortag_add(tag, mp)               (ENOSYS)
@@ -185,9 +195,9 @@ int		xfs_errortag_clearall_umount(int64_t fsid, char *fsname,
 
 struct xfs_mount;
 /* PRINTFLIKE4 */
-void            xfs_cmn_err(int panic_tag, int level, struct xfs_mount *mp,
+extern void xfs_cmn_err(int panic_tag, int level, struct xfs_mount *mp,
                             char *fmt, ...);
 /* PRINTFLIKE3 */
-void            xfs_fs_cmn_err(int level, struct xfs_mount *mp, char *fmt, ...);
+extern void xfs_fs_cmn_err(int level, struct xfs_mount *mp, char *fmt, ...);
 
 #endif  /* __XFS_ERROR_H__ */