xfs: Convert remaining cmn_err() callers to new API

Once converted, kill the remainder of the cmn_err() interface.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

1 files changed, 10 insertions, 15 deletions

diff --git a/fs/xfs/xfs_dir2_node.c b/fs/xfs/xfs_dir2_node.c
index f9a0864b696a..a0aab7d3294f 100644
--- a/fs/xfs/xfs_dir2_node.c
+++ b/fs/xfs/xfs_dir2_node.c
@@ -899,10 +899,9 @@ xfs_dir2_leafn_rebalance(
         if(blk2->index < 0) {
                 state->inleaf = 1;
                 blk2->index = 0;
-                cmn_err(CE_ALERT,
-                        "xfs_dir2_leafn_rebalance: picked the wrong leaf? reverting original leaf: "
-                        "blk1->index %d\n",
-                        blk1->index);
+                xfs_alert(args->dp->i_mount,
+        "%s: picked the wrong leaf? reverting original leaf: blk1->index %d\n",
+                        __func__, blk1->index);
         }
 }
 
@@ -1641,26 +1640,22 @@ xfs_dir2_node_addname_int(
                         }
 
                         if (unlikely(xfs_dir2_db_to_fdb(mp, dbno) != fbno)) {
-                                cmn_err(CE_ALERT,
-                                        "xfs_dir2_node_addname_int: dir ino "
-                                        "%llu needed freesp block %lld for\n"
-                                        "  data block %lld, got %lld\n"
-                                        "  ifbno %llu lastfbno %d\n",
-                                        (unsigned long long)dp->i_ino,
+                                xfs_alert(mp,
+                        "%s: dir ino " "%llu needed freesp block %lld for\n"
+                        "  data block %lld, got %lld ifbno %llu lastfbno %d",
+                                        __func__, (unsigned long long)dp->i_ino,
                                         (long long)xfs_dir2_db_to_fdb(mp, dbno),
                                         (long long)dbno, (long long)fbno,
                                         (unsigned long long)ifbno, lastfbno);
                                 if (fblk) {
-                                        cmn_err(CE_ALERT,
-                                                " fblk 0x%p blkno %llu "
-                                                "index %d magic 0x%x\n",
+                                        xfs_alert(mp,
+                                " fblk 0x%p blkno %llu index %d magic 0x%x",
                                                 fblk,
                                                 (unsigned long long)fblk->blkno,
                                                 fblk->index,
                                                 fblk->magic);
                                 } else {
-                                        cmn_err(CE_ALERT,
-                                                " ... fblk is NULL\n");
+                                        xfs_alert(mp, " ... fblk is NULL");
                                 }
                                 XFS_ERROR_REPORT("xfs_dir2_node_addname_int",
                                                  XFS_ERRLEVEL_LOW, mp);