aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/support
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2011-03-06 18:05:35 -0500
committerDave Chinner <david@fromorbit.com>2011-03-06 18:05:35 -0500
commit5348778699bba92bf28b79863e09e7181d8cf95c (patch)
tree77f5349bc85bf4d35b73a9a66de304535e507bf4 /fs/xfs/support
parentaf34e09da42801c97f39f768c715f5511d914b52 (diff)
xfs: convert xfs_fs_cmn_err to new error logging API
Continue to clean up the error logging code by converting all the callers of xfs_fs_cmn_err() to the new API. Once done, remove the unused old API function. 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.c20
-rw-r--r--fs/xfs/support/debug.h2
2 files changed, 0 insertions, 22 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c
index feaca739d5cc..a1c7141af481 100644
--- a/fs/xfs/support/debug.c
+++ b/fs/xfs/support/debug.c
@@ -45,26 +45,6 @@ cmn_err(
45} 45}
46 46
47void 47void
48xfs_fs_cmn_err(
49 const char *lvl,
50 struct xfs_mount *mp,
51 const char *fmt,
52 ...)
53{
54 struct va_format vaf;
55 va_list args;
56
57 va_start(args, fmt);
58 vaf.fmt = fmt;
59 vaf.va = &args;
60
61 printk("%sFilesystem %s: %pV", lvl, mp->m_fsname, &vaf);
62 va_end(args);
63
64 BUG_ON(strncmp(lvl, KERN_EMERG, strlen(KERN_EMERG)) == 0);
65}
66
67void
68assfail(char *expr, char *file, int line) 48assfail(char *expr, char *file, int line)
69{ 49{
70 printk(KERN_CRIT "Assertion failed: %s, file: %s, line: %d\n", expr, 50 printk(KERN_CRIT "Assertion failed: %s, file: %s, line: %d\n", expr,
diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h
index eaeaa17ef4b8..4a082b9a1161 100644
--- a/fs/xfs/support/debug.h
+++ b/fs/xfs/support/debug.h
@@ -31,8 +31,6 @@ struct xfs_mount;
31 31
32void cmn_err(const char *lvl, const char *fmt, ...) 32void cmn_err(const char *lvl, const char *fmt, ...)
33 __attribute__ ((format (printf, 2, 3))); 33 __attribute__ ((format (printf, 2, 3)));
34void xfs_fs_cmn_err( const char *lvl, struct xfs_mount *mp,
35 const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
36 34
37extern void assfail(char *expr, char *f, int l); 35extern void assfail(char *expr, char *f, int l);
38 36