1 files changed, 25 insertions, 36 deletions

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 198b2e68a487..4a6133cc9112 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1757,8 +1757,7 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi,
                 devi = f2fs_target_device_index(sbi, blkstart);
                 if (blkstart < FDEV(devi).start_blk ||
                     blkstart > FDEV(devi).end_blk) {
-                        f2fs_msg(sbi->sb, KERN_ERR, "Invalid block %x",
-                                 blkstart);
+                        f2fs_err(sbi, "Invalid block %x", blkstart);
                         return -EIO;
                 }
                 blkstart -= FDEV(devi).start_blk;
@@ -1771,10 +1770,9 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi,
 
                 if (sector & (bdev_zone_sectors(bdev) - 1) ||
                                 nr_sects != bdev_zone_sectors(bdev)) {
-                        f2fs_msg(sbi->sb, KERN_ERR,
-                                "(%d) %s: Unaligned zone reset attempted (block %x + %x)",
-                                devi, sbi->s_ndevs ? FDEV(devi).path: "",
-                                blkstart, blklen);
+                        f2fs_err(sbi, "(%d) %s: Unaligned zone reset attempted (block %x + %x)",
+                                 devi, sbi->s_ndevs ? FDEV(devi).path : "",
+                                 blkstart, blklen);
                         return -EIO;
                 }
                 trace_f2fs_issue_reset_zone(bdev, blkstart);
@@ -2138,15 +2136,14 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)
                 mir_exist = f2fs_test_and_set_bit(offset,
                                                 se->cur_valid_map_mir);
                 if (unlikely(exist != mir_exist)) {
-                        f2fs_msg(sbi->sb, KERN_ERR, "Inconsistent error "
-                                "when setting bitmap, blk:%u, old bit:%d",
-                                blkaddr, exist);
+                        f2fs_err(sbi, "Inconsistent error when setting bitmap, blk:%u, old bit:%d",
+                                 blkaddr, exist);
                         f2fs_bug_on(sbi, 1);
                 }
 #endif
                 if (unlikely(exist)) {
-                        f2fs_msg(sbi->sb, KERN_ERR,
-                                "Bitmap was wrongly set, blk:%u", blkaddr);
+                        f2fs_err(sbi, "Bitmap was wrongly set, blk:%u",
+                                 blkaddr);
                         f2fs_bug_on(sbi, 1);
                         se->valid_blocks--;
                         del = 0;
@@ -2167,15 +2164,14 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)
                 mir_exist = f2fs_test_and_clear_bit(offset,
                                                 se->cur_valid_map_mir);
                 if (unlikely(exist != mir_exist)) {
-                        f2fs_msg(sbi->sb, KERN_ERR, "Inconsistent error "
-                                "when clearing bitmap, blk:%u, old bit:%d",
-                                blkaddr, exist);
+                        f2fs_err(sbi, "Inconsistent error when clearing bitmap, blk:%u, old bit:%d",
+                                 blkaddr, exist);
                         f2fs_bug_on(sbi, 1);
                 }
 #endif
                 if (unlikely(!exist)) {
-                        f2fs_msg(sbi->sb, KERN_ERR,
-                                "Bitmap was wrongly cleared, blk:%u", blkaddr);
+                        f2fs_err(sbi, "Bitmap was wrongly cleared, blk:%u",
+                                 blkaddr);
                         f2fs_bug_on(sbi, 1);
                         se->valid_blocks++;
                         del = 0;
@@ -2683,9 +2679,8 @@ unlock:
         up_write(&SIT_I(sbi)->sentry_lock);
 
         if (segno != curseg->segno)
-                f2fs_msg(sbi->sb, KERN_NOTICE,
-                        "For resize: curseg of type %d: %u ==> %u",
-                        type, segno, curseg->segno);
+                f2fs_notice(sbi, "For resize: curseg of type %d: %u ==> %u",
+                            type, segno, curseg->segno);
 
         mutex_unlock(&curseg->curseg_mutex);
         up_read(&SM_I(sbi)->curseg_lock);
@@ -2823,8 +2818,7 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range)
                 goto out;
 
         if (is_sbi_flag_set(sbi, SBI_NEED_FSCK)) {
-                f2fs_msg(sbi->sb, KERN_WARNING,
-                        "Found FS corruption, run fsck to fix.");
+                f2fs_warn(sbi, "Found FS corruption, run fsck to fix.");
                 return -EIO;
         }
 
@@ -3585,9 +3579,8 @@ static int restore_curseg_summaries(struct f2fs_sb_info *sbi)
         /* sanity check for summary blocks */
         if (nats_in_cursum(nat_j) > NAT_JOURNAL_ENTRIES ||
                         sits_in_cursum(sit_j) > SIT_JOURNAL_ENTRIES) {
-                f2fs_msg(sbi->sb, KERN_ERR,
-                        "invalid journal entries nats %u sits %u\n",
-                        nats_in_cursum(nat_j), sits_in_cursum(sit_j));
+                f2fs_err(sbi, "invalid journal entries nats %u sits %u\n",
+                         nats_in_cursum(nat_j), sits_in_cursum(sit_j));
                 return -EINVAL;
         }
 
@@ -4155,9 +4148,8 @@ static int build_sit_entries(struct f2fs_sb_info *sbi)
 
                 start = le32_to_cpu(segno_in_journal(journal, i));
                 if (start >= MAIN_SEGS(sbi)) {
-                        f2fs_msg(sbi->sb, KERN_ERR,
-                                        "Wrong journal entry on segno %u",
-                                        start);
+                        f2fs_err(sbi, "Wrong journal entry on segno %u",
+                                 start);
                         set_sbi_flag(sbi, SBI_NEED_FSCK);
                         err = -EINVAL;
                         break;
@@ -4196,9 +4188,8 @@ static int build_sit_entries(struct f2fs_sb_info *sbi)
         up_read(&curseg->journal_rwsem);
 
         if (!err && total_node_blocks != valid_node_count(sbi)) {
-                f2fs_msg(sbi->sb, KERN_ERR,
-                        "SIT is corrupted node# %u vs %u",
-                        total_node_blocks, valid_node_count(sbi));
+                f2fs_err(sbi, "SIT is corrupted node# %u vs %u",
+                         total_node_blocks, valid_node_count(sbi));
                 set_sbi_flag(sbi, SBI_NEED_FSCK);
                 err = -EINVAL;
         }
@@ -4314,12 +4305,10 @@ static int sanity_check_curseg(struct f2fs_sb_info *sbi)
                         if (!f2fs_test_bit(blkofs, se->cur_valid_map))
                                 continue;
 out:
-                        f2fs_msg(sbi->sb, KERN_ERR,
-                                "Current segment's next free block offset is "
-                                "inconsistent with bitmap, logtype:%u, "
-                                "segno:%u, type:%u, next_blkoff:%u, blkofs:%u",
-                                i, curseg->segno, curseg->alloc_type,
-                                curseg->next_blkoff, blkofs);
+                        f2fs_err(sbi,
+                                 "Current segment's next free block offset is inconsistent with bitmap, logtype:%u, segno:%u, type:%u, next_blkoff:%u, blkofs:%u",
+                                 i, curseg->segno, curseg->alloc_type,
+                                 curseg->next_blkoff, blkofs);
                         return -EINVAL;
                 }
         }