Commit a4ba5dfc authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix to update f2fs_super_block fields under sb_lock 



Fields in struct f2fs_super_block should be updated under coverage
of sb_lock, fix to adjust update_sb_metadata() for that rule.

Fixes: 04f0b2ea ("f2fs: ioctl for removing a range from F2FS")
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent c84ef3c5

fs/f2fs/gc.c

+13 −4
Original line number Diff line number Diff line
@@ -1442,12 +1442,19 @@ static int free_segment_range(struct f2fs_sb_info *sbi, unsigned int start, 
static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs)

{

	struct f2fs_super_block *raw_sb = F2FS_RAW_SUPER(sbi);

	int section_count = le32_to_cpu(raw_sb->section_count);

	int segment_count = le32_to_cpu(raw_sb->segment_count);

	int segment_count_main = le32_to_cpu(raw_sb->segment_count_main);

	long long block_count = le64_to_cpu(raw_sb->block_count);

	int section_count;

	int segment_count;

	int segment_count_main;

	long long block_count;

	int segs = secs * sbi->segs_per_sec;



	down_write(&sbi->sb_lock);



	section_count = le32_to_cpu(raw_sb->section_count);

	segment_count = le32_to_cpu(raw_sb->segment_count);

	segment_count_main = le32_to_cpu(raw_sb->segment_count_main);

	block_count = le64_to_cpu(raw_sb->block_count);



	raw_sb->section_count = cpu_to_le32(section_count + secs);

	raw_sb->segment_count = cpu_to_le32(segment_count + segs);

	raw_sb->segment_count_main = cpu_to_le32(segment_count_main + segs);
@@ -1461,6 +1468,8 @@ static void update_sb_metadata(struct f2fs_sb_info *sbi, int secs) 
		raw_sb->devs[last_dev].total_segments =

						cpu_to_le32(dev_segs + segs);

	}



	up_write(&sbi->sb_lock);

}



static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)