diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-09 15:29:40 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-09 15:29:40 +1000 |
| commit | b65745205fc00d8c7722ec74e9bd955f3861c7e2 (patch) | |
| tree | 524f5bacfcdf54828e97b5368eb35de938651ada /fs/xfs/support | |
| parent | 9c48876a05b6fbe41f1933fae3529c268d78cad0 (diff) | |
| download | linux-stable-b65745205fc00d8c7722ec74e9bd955f3861c7e2.tar.gz linux-stable-b65745205fc00d8c7722ec74e9bd955f3861c7e2.tar.bz2 linux-stable-b65745205fc00d8c7722ec74e9bd955f3861c7e2.zip | |
[XFS] Portability changes: remove prdev, stick to one diagnostic
interface.
SGI-PV: 953338
SGI-Modid: xfs-linux-melb:xfs-kern:26103a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/support')
| -rw-r--r-- | fs/xfs/support/debug.c | 4 | ||||
| -rw-r--r-- | fs/xfs/support/debug.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c index b08b3d9345b7..36fbeccdc722 100644 --- a/fs/xfs/support/debug.c +++ b/fs/xfs/support/debug.c @@ -47,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); @@ -68,7 +68,7 @@ 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); diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h index e3bf58112e7e..4f54dca662a8 100644 --- a/fs/xfs/support/debug.h +++ b/fs/xfs/support/debug.h @@ -33,9 +33,6 @@ extern void cmn_err(int, char *, ...) __attribute__ ((format (printf, 2, 3))); extern void assfail(char *expr, char *f, int l); -#define prdev(fmt,targ,args...) \ - printk("Device %s - " fmt "\n", XFS_BUFTARG_NAME(targ), ## args) - #define ASSERT_ALWAYS(expr) \ (unlikely((expr) != 0) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) |