Fix xfs debug build breakage by pushing xfs_error.h after

[linux-2.6-omap-h63xx.git] / fs / xfs / support / debug.c

diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c
index 08bbd3cb87aefb055088902550405c49a92be228..3f3610a7ee059210eea3beadbffe13f87609dce9 100644 (file)
--- a/fs/xfs/support/debug.c
+++ b/fs/xfs/support/debug.c
@@ -17,7 +17,14 @@
  */
 #include <xfs.h>
 #include "debug.h"
-#include "spin.h"
+
+/* xfs_mount.h drags a lot of crap in, sorry.. */
+#include "xfs_sb.h"
+#include "xfs_inum.h"
+#include "xfs_ag.h"
+#include "xfs_dmapi.h"
+#include "xfs_mount.h"
+#include "xfs_error.h"
 
 static char            message[1024];  /* keep it off the stack */
 static DEFINE_SPINLOCK(xfs_err_lock);
@@ -56,22 +63,42 @@ cmn_err(register int level, char *fmt, ...)
 }
 
 void
-icmn_err(register int level, char *fmt, va_list ap)
+xfs_fs_vcmn_err(
+       int                     level,
+       struct xfs_mount        *mp,
+       char                    *fmt,
+       va_list                 ap)
 {
-       ulong   flags;
-       int     len;
+       unsigned long           flags;
+       int                     len = 0;
 
        level &= XFS_ERR_MASK;
-       if(level > XFS_MAX_ERR_LEVEL)
+       if (level > XFS_MAX_ERR_LEVEL)
                level = XFS_MAX_ERR_LEVEL;
+
        spin_lock_irqsave(&xfs_err_lock,flags);
-       len = vsnprintf(message, sizeof(message), fmt, ap);
+
+       if (mp) {
+               len = sprintf(message, "Filesystem \"%s\": ", mp->m_fsname);
+
+               /*
+                * Skip the printk if we can't print anything useful
+                * due to an over-long device name.
+                */
+               if (len >= sizeof(message))
+                       goto out;
+       }
+
+       len = vsnprintf(message + len, sizeof(message) - len, fmt, ap);
        if (len >= sizeof(message))
                len = sizeof(message) - 1;
        if (message[len-1] == '\n')
                message[len-1] = 0;
+
        printk("%s%s\n", err_level[level], message);
+ out:
        spin_unlock_irqrestore(&xfs_err_lock,flags);
+
        BUG_ON(level == CE_PANIC);
 }
 
@@ -82,19 +109,8 @@ assfail(char *expr, char *file, int line)
        BUG();
 }
 
-#if ((defined(DEBUG) || defined(INDUCE_IO_ERRROR)) && !defined(NO_WANT_RANDOM))
-unsigned long random(void)
+void
+xfs_hex_dump(void *p, int length)
 {
-       static unsigned long    RandomValue = 1;
-       /* cycles pseudo-randomly through all values between 1 and 2^31 - 2 */
-       register long   rv = RandomValue;
-       register long   lo;
-       register long   hi;
-
-       hi = rv / 127773;
-       lo = rv % 127773;
-       rv = 16807 * lo - 2836 * hi;
-       if (rv <= 0) rv += 2147483647;
-       return RandomValue = rv;
+       print_hex_dump(KERN_ALERT, "", DUMP_PREFIX_ADDRESS, 16, 1, p, length, 1);
 }
-#endif /* DEBUG || INDUCE_IO_ERRROR || !NO_WANT_RANDOM */