summaryrefslogtreecommitdiff
path: root/fs/xfs/support
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2011-03-07 10:08:35 +1100
committerDave Chinner <david@fromorbit.com>2011-03-07 10:08:35 +1100
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 @@
#include <xfs.h>
#include "debug.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_mount.h"
-#include "xfs_error.h"
-
-void
-cmn_err(
- const char *lvl,
- const char *fmt,
- ...)
-{
- struct va_format vaf;
- va_list args;
-
- va_start(args, fmt);
- vaf.fmt = fmt;
- vaf.va = &args;
-
- printk("%s%pV", lvl, &vaf);
- va_end(args);
-
- BUG_ON(strncmp(lvl, KERN_EMERG, strlen(KERN_EMERG)) == 0);
-}
-
void
assfail(char *expr, char *file, int line)
{
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 @@
#include <stdarg.h>
-struct xfs_mount;
-
-#define CE_DEBUG KERN_DEBUG
-#define CE_CONT KERN_INFO
-#define CE_NOTE KERN_NOTICE
-#define CE_WARN KERN_WARNING
-#define CE_ALERT KERN_ALERT
-#define CE_PANIC KERN_EMERG
-
-void cmn_err(const char *lvl, const char *fmt, ...)
- __attribute__ ((format (printf, 2, 3)));
-
extern void assfail(char *expr, char *f, int l);
#define ASSERT_ALWAYS(expr) \