1 files changed, 14 insertions, 20 deletions

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 7b4a0fd59512..a5ae1ef1a6d0 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -146,8 +146,8 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr,
 
         exist = f2fs_test_bit(offset, se->cur_valid_map);
         if (!exist && type == DATA_GENERIC_ENHANCE) {
-                f2fs_msg(sbi->sb, KERN_ERR, "Inconsistent error "
-                        "blkaddr:%u, sit bitmap:%d", blkaddr, exist);
+                f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d",
+                         blkaddr, exist);
                 set_sbi_flag(sbi, SBI_NEED_FSCK);
                 WARN_ON(1);
         }
@@ -184,8 +184,8 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,
         case DATA_GENERIC_ENHANCE_READ:
                 if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||
                                 blkaddr < MAIN_BLKADDR(sbi))) {
-                        f2fs_msg(sbi->sb, KERN_WARNING,
-                                "access invalid blkaddr:%u", blkaddr);
+                        f2fs_warn(sbi, "access invalid blkaddr:%u",
+                                  blkaddr);
                         set_sbi_flag(sbi, SBI_NEED_FSCK);
                         WARN_ON(1);
                         return false;
@@ -657,9 +657,8 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino)
 
 err_out:
         set_sbi_flag(sbi, SBI_NEED_FSCK);
-        f2fs_msg(sbi->sb, KERN_WARNING,
-                        "%s: orphan failed (ino=%x), run fsck to fix.",
-                        __func__, ino);
+        f2fs_warn(sbi, "%s: orphan failed (ino=%x), run fsck to fix.",
+                  __func__, ino);
         return err;
 }
 
@@ -676,13 +675,12 @@ int f2fs_recover_orphan_inodes(struct f2fs_sb_info *sbi)
                 return 0;
 
         if (bdev_read_only(sbi->sb->s_bdev)) {
-                f2fs_msg(sbi->sb, KERN_INFO, "write access "
-                        "unavailable, skipping orphan cleanup");
+                f2fs_info(sbi, "write access unavailable, skipping orphan cleanup");
                 return 0;
         }
 
         if (s_flags & SB_RDONLY) {
-                f2fs_msg(sbi->sb, KERN_INFO, "orphan cleanup on readonly fs");
+                f2fs_info(sbi, "orphan cleanup on readonly fs");
                 sbi->sb->s_flags &= ~SB_RDONLY;
         }
 
@@ -827,15 +825,14 @@ static int get_checkpoint_version(struct f2fs_sb_info *sbi, block_t cp_addr,
         if (crc_offset < CP_MIN_CHKSUM_OFFSET ||
                         crc_offset > CP_CHKSUM_OFFSET) {
                 f2fs_put_page(*cp_page, 1);
-                f2fs_msg(sbi->sb, KERN_WARNING,
-                        "invalid crc_offset: %zu", crc_offset);
+                f2fs_warn(sbi, "invalid crc_offset: %zu", crc_offset);
                 return -EINVAL;
         }
 
         crc = f2fs_checkpoint_chksum(sbi, *cp_block);
         if (crc != cur_cp_crc(*cp_block)) {
                 f2fs_put_page(*cp_page, 1);
-                f2fs_msg(sbi->sb, KERN_WARNING, "invalid crc value");
+                f2fs_warn(sbi, "invalid crc value");
                 return -EINVAL;
         }
 
@@ -858,9 +855,8 @@ static struct page *validate_checkpoint(struct f2fs_sb_info *sbi,
 
         if (le32_to_cpu(cp_block->cp_pack_total_block_count) >
                                         sbi->blocks_per_seg) {
-                f2fs_msg(sbi->sb, KERN_WARNING,
-                        "invalid cp_pack_total_block_count:%u",
-                        le32_to_cpu(cp_block->cp_pack_total_block_count));
+                f2fs_warn(sbi, "invalid cp_pack_total_block_count:%u",
+                          le32_to_cpu(cp_block->cp_pack_total_block_count));
                 goto invalid_cp;
         }
         pre_version = *version;
@@ -1559,8 +1555,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
         if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) {
                 if (cpc->reason != CP_PAUSE)
                         return 0;
-                f2fs_msg(sbi->sb, KERN_WARNING,
-                                "Start checkpoint disabled!");
+                f2fs_warn(sbi, "Start checkpoint disabled!");
         }
         mutex_lock(&sbi->cp_mutex);
 
@@ -1626,8 +1621,7 @@ stop:
         stat_inc_cp_count(sbi->stat_info);
 
         if (cpc->reason & CP_RECOVERY)
-                f2fs_msg(sbi->sb, KERN_NOTICE,
-                        "checkpoint: version = %llx", ckpt_ver);
+                f2fs_notice(sbi, "checkpoint: version = %llx", ckpt_ver);
 
         /* do checkpoint periodically */
         f2fs_update_time(sbi, CP_TIME);