1 files changed, 8 insertions, 7 deletions

diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 6f8c21ce0d6d..e5413d96f1af 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -130,10 +130,12 @@ xfs_buf_item_log_check(
         orig = bip->bli_orig;
         buffer = XFS_BUF_PTR(bp);
         for (x = 0; x < XFS_BUF_COUNT(bp); x++) {
-                if (orig[x] != buffer[x] && !btst(bip->bli_logged, x))
-                        cmn_err(CE_PANIC,
-        "xfs_buf_item_log_check bip %x buffer %x orig %x index %d",
-                                bip, bp, orig, x);
+                if (orig[x] != buffer[x] && !btst(bip->bli_logged, x)) {
+                        xfs_emerg(bp->b_mount,
+                                "%s: bip %x buffer %x orig %x index %d",
+                                __func__, bip, bp, orig, x);
+                        ASSERT(0);
+                }
         }
 }
 #else
@@ -983,10 +985,9 @@ xfs_buf_iodone_callbacks(
         if (XFS_BUF_TARGET(bp) != lasttarg ||
             time_after(jiffies, (lasttime + 5*HZ))) {
                 lasttime = jiffies;
-                cmn_err(CE_ALERT, "Device %s, XFS metadata write error"
-                                " block 0x%llx in %s",
+                xfs_alert(mp, "Device %s: metadata write error block 0x%llx",
                         XFS_BUFTARG_NAME(XFS_BUF_TARGET(bp)),
-                      (__uint64_t)XFS_BUF_ADDR(bp), mp->m_fsname);
+                      (__uint64_t)XFS_BUF_ADDR(bp));
         }
         lasttarg = XFS_BUF_TARGET(bp);