2 files changed, 9 insertions, 2 deletions

diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index 535c13677e7a..686ba6fb20dd 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -55,9 +55,9 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
                         return ptr;
                 if (!(++retries % 100))
                         xfs_err(NULL,
-                "%s(%u) possible memory allocation deadlock in %s (mode:0x%x)",
+        "%s(%u) possible memory allocation deadlock size %u in %s (mode:0x%x)",
                                 current->comm, current->pid,
-                                __func__, lflags);
+                                (unsigned int)size, __func__, lflags);
                 congestion_wait(BLK_RW_ASYNC, HZ/50);
         } while (1);
 }
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);