1 files changed, 7 insertions, 9 deletions

diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index 429007b8036e..b74602813a05 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -109,7 +109,7 @@
 #define START_SEGNO(segno)              \
         (SIT_BLOCK_OFFSET(segno) * SIT_ENTRY_PER_BLOCK)
 #define SIT_BLK_CNT(sbi)                        \
-        ((MAIN_SEGS(sbi) + SIT_ENTRY_PER_BLOCK - 1) / SIT_ENTRY_PER_BLOCK)
+        DIV_ROUND_UP(MAIN_SEGS(sbi), SIT_ENTRY_PER_BLOCK)
 #define f2fs_bitmap_size(nr)                    \
         (BITS_TO_LONGS(nr) * sizeof(unsigned long))
 
@@ -693,21 +693,19 @@ static inline int check_block_count(struct f2fs_sb_info *sbi,
         } while (cur_pos < sbi->blocks_per_seg);
 
         if (unlikely(GET_SIT_VBLOCKS(raw_sit) != valid_blocks)) {
-                f2fs_msg(sbi->sb, KERN_ERR,
-                                "Mismatch valid blocks %d vs. %d",
-                                        GET_SIT_VBLOCKS(raw_sit), valid_blocks);
+                f2fs_err(sbi, "Mismatch valid blocks %d vs. %d",
+                         GET_SIT_VBLOCKS(raw_sit), valid_blocks);
                 set_sbi_flag(sbi, SBI_NEED_FSCK);
-                return -EINVAL;
+                return -EFSCORRUPTED;
         }
 
         /* check segment usage, and check boundary of a given segment number */
         if (unlikely(GET_SIT_VBLOCKS(raw_sit) > sbi->blocks_per_seg
                                         || segno > TOTAL_SEGS(sbi) - 1)) {
-                f2fs_msg(sbi->sb, KERN_ERR,
-                                "Wrong valid blocks %d or segno %u",
-                                        GET_SIT_VBLOCKS(raw_sit), segno);
+                f2fs_err(sbi, "Wrong valid blocks %d or segno %u",
+                         GET_SIT_VBLOCKS(raw_sit), segno);
                 set_sbi_flag(sbi, SBI_NEED_FSCK);
-                return -EINVAL;
+                return -EFSCORRUPTED;
         }
         return 0;
 }