diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-10-12 18:38:25 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-10-12 18:38:25 +1100 |
| commit | 1e2103cbf4adfd5490ee5f3ee59750bd70d2047e (patch) | |
| tree | fb8256698fc1098784ef0bedba22768a793679f4 /fs/xfs/xfs_message.c | |
| parent | 8a56d7c305b9613dfe416fd1af06871ec34bb103 (diff) | |
| parent | 847f9f6875fb02b576035e3dc31f5e647b7617a7 (diff) | |
| download | linux-1e2103cbf4adfd5490ee5f3ee59750bd70d2047e.tar.gz linux-1e2103cbf4adfd5490ee5f3ee59750bd70d2047e.tar.bz2 linux-1e2103cbf4adfd5490ee5f3ee59750bd70d2047e.zip | |
Merge branch 'xfs-misc-fixes-for-4.4-1' into for-next
Diffstat (limited to 'fs/xfs/xfs_message.c')
| -rw-r--r-- | fs/xfs/xfs_message.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c index d8b67547ab34..11792d888e4e 100644 --- a/fs/xfs/xfs_message.c +++ b/fs/xfs/xfs_message.c @@ -17,6 +17,7 @@ #include "xfs.h" #include "xfs_fs.h" +#include "xfs_error.h" #include "xfs_format.h" #include "xfs_log_format.h" #include "xfs_trans_resv.h" @@ -43,6 +44,7 @@ void func(const struct xfs_mount *mp, const char *fmt, ...) \ { \ struct va_format vaf; \ va_list args; \ + int level; \ \ va_start(args, fmt); \ \ @@ -51,6 +53,11 @@ void func(const struct xfs_mount *mp, const char *fmt, ...) \ \ __xfs_printk(kern_level, mp, &vaf); \ va_end(args); \ + \ + if (!kstrtoint(kern_level, 0, &level) && \ + level <= LOGLEVEL_ERR && \ + xfs_error_level >= XFS_ERRLEVEL_HIGH) \ + xfs_stack_trace(); \ } \ define_xfs_printk_level(xfs_emerg, KERN_EMERG); |