Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / fs / xfs / xfs_error.c

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index edac5b0..b92fd7b 100644 (file)
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -27,29 +27,6 @@
 
 #ifdef DEBUG
 
-int    xfs_etrap[XFS_ERROR_NTRAP] = {
-       0,
-};
-
-int
-xfs_error_trap(int e)
-{
-       int i;
-
-       if (!e)
-               return 0;
-       for (i = 0; i < XFS_ERROR_NTRAP; i++) {
-               if (xfs_etrap[i] == 0)
-                       break;
-               if (e != xfs_etrap[i])
-                       continue;
-               xfs_notice(NULL, "%s: error %d", __func__, e);
-               BUG();
-               break;
-       }
-       return e;
-}
-
 int    xfs_etest[XFS_NUM_INJECT_ERROR];
 int64_t        xfs_etest_fsid[XFS_NUM_INJECT_ERROR];
 char * xfs_etest_fsname[XFS_NUM_INJECT_ERROR];
@@ -190,7 +167,7 @@ xfs_verifier_error(
        struct xfs_mount *mp = bp->b_target->bt_mount;
 
        xfs_alert(mp, "Metadata %s detected at %pF, block 0x%llx",
-                 bp->b_error == EFSBADCRC ? "CRC error" : "corruption",
+                 bp->b_error == -EFSBADCRC ? "CRC error" : "corruption",
                  __return_address, bp->b_bn);
 
        xfs_alert(mp, "Unmount and run xfs_repair");