f2fs: remove duplicated code in sanity_check_area_boundary
authorWang Xiaojun <wangxiaojun11@huawei.com>
Fri, 18 Sep 2020 00:31:24 +0000 (08:31 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 29 Sep 2020 08:48:34 +0000 (01:48 -0700)
Use seg_end_blkaddr instead of "segment0_blkaddr + (segment_count <<
log_blocks_per_seg)".

Signed-off-by: Wang Xiaojun <wangxiaojun11@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/super.c

index bbe993cc44ff3f3a865b88c8e92e5b4c35577333..7a8a32ea7caa9ef6ecb56a2623ff1bced38cc88d 100644 (file)
@@ -2710,10 +2710,8 @@ static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi,
        }
 
        if (main_end_blkaddr > seg_end_blkaddr) {
-               f2fs_info(sbi, "Wrong MAIN_AREA boundary, start(%u) end(%u) block(%u)",
-                         main_blkaddr,
-                         segment0_blkaddr +
-                         (segment_count << log_blocks_per_seg),
+               f2fs_info(sbi, "Wrong MAIN_AREA boundary, start(%u) end(%llu) block(%u)",
+                         main_blkaddr, seg_end_blkaddr,
                          segment_count_main << log_blocks_per_seg);
                return true;
        } else if (main_end_blkaddr < seg_end_blkaddr) {
@@ -2731,10 +2729,8 @@ static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi,
                        err = __f2fs_commit_super(bh, NULL);
                        res = err ? "failed" : "done";
                }
-               f2fs_info(sbi, "Fix alignment : %s, start(%u) end(%u) block(%u)",
-                         res, main_blkaddr,
-                         segment0_blkaddr +
-                         (segment_count << log_blocks_per_seg),
+               f2fs_info(sbi, "Fix alignment : %s, start(%u) end(%llu) block(%u)",
+                         res, main_blkaddr, seg_end_blkaddr,
                          segment_count_main << log_blocks_per_seg);
                if (err)
                        return true;