diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-07-15 07:37:18 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-07-15 07:37:18 +1000 |
| commit | 7f8a058f6dc52219117bc2469b1fb816f7fa1a4b (patch) | |
| tree | 43ce8eed4d26beb6f2acff2279c43eae7f79f83a /fs/xfs/xfs_error.h | |
| parent | 03e01349c654fbdea80d3d9b4ab599244eb55bb7 (diff) | |
| parent | 2451337dd043901b5270b7586942abe564443e3d (diff) | |
| download | talos-obmc-linux-7f8a058f6dc52219117bc2469b1fb816f7fa1a4b.tar.gz talos-obmc-linux-7f8a058f6dc52219117bc2469b1fb816f7fa1a4b.zip | |
Merge branch 'xfs-libxfs-restructure' into for-next
Diffstat (limited to 'fs/xfs/xfs_error.h')
| -rw-r--r-- | fs/xfs/xfs_error.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h index c1c57d4a4b5d..279a76e52791 100644 --- 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; \ } \ } |
