1 files changed, 12 insertions, 18 deletions

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 865f1525df32..4d9b4c58d8a9 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -34,9 +34,8 @@ int f2fs_check_nid_range(struct f2fs_sb_info *sbi, nid_t nid)
 {
         if (unlikely(nid < F2FS_ROOT_INO(sbi) || nid >= NM_I(sbi)->max_nid)) {
                 set_sbi_flag(sbi, SBI_NEED_FSCK);
-                f2fs_msg(sbi->sb, KERN_WARNING,
-                                "%s: out-of-range nid=%x, run fsck to fix.",
-                                __func__, nid);
+                f2fs_warn(sbi, "%s: out-of-range nid=%x, run fsck to fix.",
+                          __func__, nid);
                 return -EINVAL;
         }
         return 0;
@@ -1189,10 +1188,8 @@ int f2fs_remove_inode_page(struct inode *inode)
         }
 
         if (unlikely(inode->i_blocks != 0 && inode->i_blocks != 8)) {
-                f2fs_msg(F2FS_I_SB(inode)->sb, KERN_WARNING,
-                        "Inconsistent i_blocks, ino:%lu, iblocks:%llu",
-                        inode->i_ino,
-                        (unsigned long long)inode->i_blocks);
+                f2fs_warn(F2FS_I_SB(inode), "Inconsistent i_blocks, ino:%lu, iblocks:%llu",
+                          inode->i_ino, (unsigned long long)inode->i_blocks);
                 set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK);
         }
 
@@ -1380,11 +1377,10 @@ repeat:
         }
 page_hit:
         if(unlikely(nid != nid_of_node(page))) {
-                f2fs_msg(sbi->sb, KERN_WARNING, "inconsistent node block, "
-                        "nid:%lu, node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]",
-                        nid, nid_of_node(page), ino_of_node(page),
-                        ofs_of_node(page), cpver_of_node(page),
-                        next_blkaddr_of_node(page));
+                f2fs_warn(sbi, "inconsistent node block, nid:%lu, node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]",
+                          nid, nid_of_node(page), ino_of_node(page),
+                          ofs_of_node(page), cpver_of_node(page),
+                          next_blkaddr_of_node(page));
                 err = -EINVAL;
 out_err:
                 ClearPageUptodate(page);
@@ -1752,9 +1748,8 @@ continue_unlock:
                         break;
         }
         if (!ret && atomic && !marked) {
-                f2fs_msg(sbi->sb, KERN_DEBUG,
-                        "Retry to write fsync mark: ino=%u, idx=%lx",
-                                        ino, last_page->index);
+                f2fs_debug(sbi, "Retry to write fsync mark: ino=%u, idx=%lx",
+                           ino, last_page->index);
                 lock_page(last_page);
                 f2fs_wait_on_page_writeback(last_page, NODE, true, true);
                 set_page_dirty(last_page);
@@ -2304,8 +2299,7 @@ static int __f2fs_build_free_nids(struct f2fs_sb_info *sbi,
                         if (ret) {
                                 up_read(&nm_i->nat_tree_lock);
                                 f2fs_bug_on(sbi, !mount);
-                                f2fs_msg(sbi->sb, KERN_ERR,
-                                        "NAT is corrupt, run fsck to fix it");
+                                f2fs_err(sbi, "NAT is corrupt, run fsck to fix it");
                                 return ret;
                         }
                 }
@@ -2915,7 +2909,7 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi)
         nm_i->full_nat_bits = nm_i->nat_bits + 8;
         nm_i->empty_nat_bits = nm_i->full_nat_bits + nat_bits_bytes;
 
-        f2fs_msg(sbi->sb, KERN_NOTICE, "Found nat_bits in checkpoint");
+        f2fs_notice(sbi, "Found nat_bits in checkpoint");
         return 0;
 }