From: Gu Zheng Date: Mon, 20 Oct 2014 09:45:49 +0000 (+0800) Subject: f2fs: use current_sit_addr to replace the open code X-Git-Tag: Ubuntu-5.10.0-12.13~15753^2~54 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2cc221861132e0ca54e3f52d506520ded8520e80;p=mirror_ubuntu-hirsute-kernel.git f2fs: use current_sit_addr to replace the open code Signed-off-by: Gu Zheng Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 19de23b119fa..21ccc4816474 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1552,17 +1552,7 @@ int lookup_journal_in_cursum(struct f2fs_summary_block *sum, int type, static struct page *get_current_sit_page(struct f2fs_sb_info *sbi, unsigned int segno) { - struct sit_info *sit_i = SIT_I(sbi); - unsigned int offset = SIT_BLOCK_OFFSET(segno); - block_t blk_addr = sit_i->sit_base_addr + offset; - - check_seg_range(sbi, segno); - - /* calculate sit block address */ - if (f2fs_test_bit(offset, sit_i->sit_bitmap)) - blk_addr += sit_i->sit_blocks; - - return get_meta_page(sbi, blk_addr); + return get_meta_page(sbi, current_sit_addr(sbi, segno)); } static struct page *get_next_sit_page(struct f2fs_sb_info *sbi,