Commit 65f1b80b authored by Yunlong Song's avatar Yunlong Song Committed by Jaegeuk Kim
Browse files

Revert "f2fs: handle dirty segments inside refresh_sit_entry" 



This reverts commit 5e443818

The commit should be reverted because call sequence of below two parts
of code must be kept:
a. update sit information, it needs to be updated before segment
allocation since latter allocation may trigger SSR, and SSR allocation
needs latest valid block information of all segments.
b. update segment status, it needs to be updated after segment allocation
since we can skip updating current opened segment status.

Fixes: 5e443818 ("f2fs: handle dirty segments inside refresh_sit_entry")
Suggested-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarYunlong Song <yunlong.song@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
[Jaegeuk Kim: remove refresh_sit_entry function]
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent a0761f63

fs/f2fs/f2fs.h

+0 −1
Original line number Diff line number Diff line
@@ -2602,7 +2602,6 @@ void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr); 
bool is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr);

void init_discard_policy(struct discard_policy *dpolicy, int discard_type,

						unsigned int granularity);

void refresh_sit_entry(struct f2fs_sb_info *sbi, block_t old, block_t new);

void stop_discard_thread(struct f2fs_sb_info *sbi);

bool f2fs_wait_discard_bios(struct f2fs_sb_info *sbi);

void clear_prefree_segments(struct f2fs_sb_info *sbi, struct cp_control *cpc);

fs/f2fs/segment.c

+14 −13
Original line number Diff line number Diff line
@@ -1894,16 +1894,6 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del) 
		get_sec_entry(sbi, segno)->valid_blocks += del;

}



void refresh_sit_entry(struct f2fs_sb_info *sbi, block_t old, block_t new)

{

	update_sit_entry(sbi, new, 1);

	if (GET_SEGNO(sbi, old) != NULL_SEGNO)

		update_sit_entry(sbi, old, -1);



	locate_dirty_segment(sbi, GET_SEGNO(sbi, old));

	locate_dirty_segment(sbi, GET_SEGNO(sbi, new));

}



void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr)

{

	unsigned int segno = GET_SEGNO(sbi, addr);
@@ -2540,13 +2530,24 @@ void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, 


	stat_inc_block_count(sbi, curseg);



	/*

	 * SIT information should be updated before segment allocation,

	 * since SSR needs latest valid block information.

	 */

	update_sit_entry(sbi, *new_blkaddr, 1);

	if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO)

		update_sit_entry(sbi, old_blkaddr, -1);



	if (!__has_curseg_space(sbi, type))

		sit_i->s_ops->allocate_segment(sbi, type, false);



	/*

	 * SIT information should be updated after segment allocation,

	 * since we need to keep dirty segments precisely under SSR.

	 * segment dirty status should be updated after segment allocation,

	 * so we just need to update status only one time after previous

	 * segment being closed.

	 */

	refresh_sit_entry(sbi, old_blkaddr, *new_blkaddr);

	locate_dirty_segment(sbi, GET_SEGNO(sbi, old_blkaddr));

	locate_dirty_segment(sbi, GET_SEGNO(sbi, *new_blkaddr));



	mutex_unlock(&sit_i->sentry_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE