aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/support
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2011-03-06 18:02:35 -0500
committerDave Chinner <david@fromorbit.com>2011-03-06 18:02:35 -0500
commit6a19d9393a5402e69fc52f5da8a828b8499a8265 (patch)
tree069f5cacc45194ee8e28e0cd59ac817918296f98 /fs/xfs/support
parenta0fa2b679ecd15b4bdbb46cd2420b6affde91cf9 (diff)
xfs: convert xfs_cmn_err to xfs_alert_tag
Continue the conversion of the old cmn_err interface be converting all the conditional panic tag errors to xfs_alert_tag() and then removing xfs_cmn_err(). 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.c28
-rw-r--r--fs/xfs/support/debug.h2
2 files changed, 0 insertions, 30 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c
index 0df88897ef84..feaca739d5cc 100644
--- a/fs/xfs/support/debug.c
+++ b/fs/xfs/support/debug.c
@@ -64,34 +64,6 @@ xfs_fs_cmn_err(
64 BUG_ON(strncmp(lvl, KERN_EMERG, strlen(KERN_EMERG)) == 0); 64 BUG_ON(strncmp(lvl, KERN_EMERG, strlen(KERN_EMERG)) == 0);
65} 65}
66 66
67/* All callers to xfs_cmn_err use CE_ALERT, so don't bother testing lvl */
68void
69xfs_cmn_err(
70 int panic_tag,
71 const char *lvl,
72 struct xfs_mount *mp,
73 const char *fmt,
74 ...)
75{
76 struct va_format vaf;
77 va_list args;
78 int do_panic = 0;
79
80 if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) {
81 printk(KERN_ALERT "XFS: Transforming an alert into a BUG.");
82 do_panic = 1;
83 }
84
85 va_start(args, fmt);
86 vaf.fmt = fmt;
87 vaf.va = &args;
88
89 printk(KERN_ALERT "Filesystem %s: %pV", mp->m_fsname, &vaf);
90 va_end(args);
91
92 BUG_ON(do_panic);
93}
94
95void 67void
96assfail(char *expr, char *file, int line) 68assfail(char *expr, char *file, int line)
97{ 69{
diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h
index 05699f67d475..eaeaa17ef4b8 100644
--- a/fs/xfs/support/debug.h
+++ b/fs/xfs/support/debug.h
@@ -33,8 +33,6 @@ void 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, 34void xfs_fs_cmn_err( const char *lvl, struct xfs_mount *mp,
35 const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); 35 const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
36void xfs_cmn_err( int panic_tag, const char *lvl, struct xfs_mount *mp,
37 const char *fmt, ...) __attribute__ ((format (printf, 4, 5)));
38 36
39extern void assfail(char *expr, char *f, int l); 37extern void assfail(char *expr, char *f, int l);
40 38