aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/support
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2011-03-06 18:08:35 -0500
committerDave Chinner <david@fromorbit.com>2011-03-06 18:08:35 -0500
commit0b932cccbdc09a72aa370456a59b40ecd6b10baf (patch)
treee13910b0589804e7e56e765e931c781829bafe8c /fs/xfs/support
parent8221112b4377a3b69f2016b5cc3c550d51dd3139 (diff)
xfs: Convert remaining cmn_err() callers to new API
Once converted, kill the remainder of the cmn_err() interface. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Alex Elder <aelder@sgi.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/support')
-rw-r--r--fs/xfs/support/debug.c26
-rw-r--r--fs/xfs/support/debug.h12
2 files changed, 0 insertions, 38 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c
index a1c7141af481..79fae3b33bdd 100644
--- a/fs/xfs/support/debug.c
+++ b/fs/xfs/support/debug.c
@@ -18,32 +18,6 @@
18#include <xfs.h> 18#include <xfs.h>
19#include "debug.h" 19#include "debug.h"
20 20
21/* xfs_mount.h drags a lot of crap in, sorry.. */
22#include "xfs_sb.h"
23#include "xfs_inum.h"
24#include "xfs_ag.h"
25#include "xfs_mount.h"
26#include "xfs_error.h"
27
28void
29cmn_err(
30 const char *lvl,
31 const char *fmt,
32 ...)
33{
34 struct va_format vaf;
35 va_list args;
36
37 va_start(args, fmt);
38 vaf.fmt = fmt;
39 vaf.va = &args;
40
41 printk("%s%pV", lvl, &vaf);
42 va_end(args);
43
44 BUG_ON(strncmp(lvl, KERN_EMERG, strlen(KERN_EMERG)) == 0);
45}
46
47void 21void
48assfail(char *expr, char *file, int line) 22assfail(char *expr, char *file, int line)
49{ 23{
diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h
index 4a082b9a1161..db36be48a43e 100644
--- a/fs/xfs/support/debug.h
+++ b/fs/xfs/support/debug.h
@@ -20,18 +20,6 @@
20 20
21#include <stdarg.h> 21#include <stdarg.h>
22 22
23struct xfs_mount;
24
25#define CE_DEBUG KERN_DEBUG
26#define CE_CONT KERN_INFO
27#define CE_NOTE KERN_NOTICE
28#define CE_WARN KERN_WARNING
29#define CE_ALERT KERN_ALERT
30#define CE_PANIC KERN_EMERG
31
32void cmn_err(const char *lvl, const char *fmt, ...)
33 __attribute__ ((format (printf, 2, 3)));
34
35extern void assfail(char *expr, char *f, int l); 23extern void assfail(char *expr, char *f, int l);
36 24
37#define ASSERT_ALWAYS(expr) \ 25#define ASSERT_ALWAYS(expr) \