Just clean up, no logic change.
Signed-off-by: Chao Yu <[email protected]>
---
fsck/mount.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/fsck/mount.c b/fsck/mount.c
index bed22d5..eed27bf 100644
--- a/fsck/mount.c
+++ b/fsck/mount.c
@@ -1700,13 +1700,12 @@ static inline void check_seg_range(struct f2fs_sb_info
*sbi, unsigned int segno)
ASSERT(segno <= end_segno);
}
-void get_current_sit_page(struct f2fs_sb_info *sbi,
- unsigned int segno, struct f2fs_sit_block *sit_blk)
+static inline block_t current_sit_addr(struct f2fs_sb_info *sbi,
+ unsigned int segno)
{
struct sit_info *sit_i = SIT_I(sbi);
unsigned int offset = SIT_BLOCK_OFFSET(sit_i, segno);
block_t blk_addr = sit_i->sit_base_addr + offset;
- int ret;
check_seg_range(sbi, segno);
@@ -1714,24 +1713,23 @@ void get_current_sit_page(struct f2fs_sb_info *sbi,
if (f2fs_test_bit(offset, sit_i->sit_bitmap))
blk_addr += sit_i->sit_blocks;
- ret = dev_read_block(sit_blk, blk_addr);
- ASSERT(ret >= 0);
+ return blk_addr;
}
-void rewrite_current_sit_page(struct f2fs_sb_info *sbi,
+void get_current_sit_page(struct f2fs_sb_info *sbi,
unsigned int segno, struct f2fs_sit_block *sit_blk)
{
- struct sit_info *sit_i = SIT_I(sbi);
- unsigned int offset = SIT_BLOCK_OFFSET(sit_i, segno);
- block_t blk_addr = sit_i->sit_base_addr + offset;
- int ret;
+ block_t blk_addr = current_sit_addr(sbi, segno);
- /* calculate sit block address */
- if (f2fs_test_bit(offset, sit_i->sit_bitmap))
- blk_addr += sit_i->sit_blocks;
+ ASSERT(dev_read_block(sit_blk, blk_addr) >= 0);
+}
- ret = dev_write_block(sit_blk, blk_addr);
- ASSERT(ret >= 0);
+void rewrite_current_sit_page(struct f2fs_sb_info *sbi,
+ unsigned int segno, struct f2fs_sit_block *sit_blk)
+{
+ block_t blk_addr = current_sit_addr(sbi, segno);
+
+ ASSERT(dev_write_block(sit_blk, blk_addr) >= 0);
}
void check_block_count(struct f2fs_sb_info *sbi,
--
2.18.0.rc1
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
