Pull esi-support into release branch

[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 bb6dc91ea261390a426f61ba958f214c34394fa6..36fbeccdc722c27a5492076fad587b13f98d5e8c 100644 (file)
--- a/fs/xfs/support/debug.c
+++ b/fs/xfs/support/debug.c
@@ -27,44 +27,11 @@ static DEFINE_SPINLOCK(xfs_err_lock);
 /* Translate from CE_FOO to KERN_FOO, err_level(CE_FOO) == KERN_FOO */
 #define XFS_MAX_ERR_LEVEL      7
 #define XFS_ERR_MASK           ((1 << 3) - 1)
-static char            *err_level[XFS_MAX_ERR_LEVEL+1] =
+static const char * const      err_level[XFS_MAX_ERR_LEVEL+1] =
                                        {KERN_EMERG, KERN_ALERT, KERN_CRIT,
                                         KERN_ERR, KERN_WARNING, KERN_NOTICE,
                                         KERN_INFO, KERN_DEBUG};
 
-void
-assfail(char *a, char *f, int l)
-{
-    printk("XFS assertion failed: %s, file: %s, line: %d\n", a, f, l);
-    BUG();
-}
-
-#if ((defined(DEBUG) || defined(INDUCE_IO_ERRROR)) && !defined(NO_WANT_RANDOM))
-
-unsigned long
-random(void)
-{
-       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 );
-}
-
-int
-get_thread_id(void)
-{
-       return current->pid;
-}
-
-#endif /* DEBUG || INDUCE_IO_ERRROR || !NO_WANT_RANDOM */
-
 void
 cmn_err(register int level, char *fmt, ...)
 {
@@ -80,7 +47,7 @@ cmn_err(register int level, char *fmt, ...)
        va_start(ap, fmt);
        if (*fmt == '!') fp++;
        len = vsprintf(message, fp, ap);
-       if (message[len-1] != '\n')
+       if (level != CE_DEBUG && message[len-1] != '\n')
                strcat(message, "\n");
        printk("%s%s", err_level[level], message);
        va_end(ap);
@@ -90,7 +57,6 @@ cmn_err(register int level, char *fmt, ...)
                BUG();
 }
 
-
 void
 icmn_err(register int level, char *fmt, va_list ap)
 {
@@ -102,10 +68,34 @@ icmn_err(register int level, char *fmt, va_list ap)
                level = XFS_MAX_ERR_LEVEL;
        spin_lock_irqsave(&xfs_err_lock,flags);
        len = vsprintf(message, fmt, ap);
-       if (message[len-1] != '\n')
+       if (level != CE_DEBUG && message[len-1] != '\n')
                strcat(message, "\n");
        spin_unlock_irqrestore(&xfs_err_lock,flags);
        printk("%s%s", err_level[level], message);
        if (level == CE_PANIC)
                BUG();
 }
+
+void
+assfail(char *expr, char *file, int line)
+{
+       printk("Assertion failed: %s, file: %s, line: %d\n", expr, file, line);
+       BUG();
+}
+
+#if ((defined(DEBUG) || defined(INDUCE_IO_ERRROR)) && !defined(NO_WANT_RANDOM))
+unsigned long random(void)
+{
+       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;
+}
+#endif /* DEBUG || INDUCE_IO_ERRROR || !NO_WANT_RANDOM */