Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f80a26b authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

ANDROID: f2fs: correct inconsistent cherry-pick 



This patch corrects the below cherry-picked patch from mainline.

commit ca1d19b6
  ("FROMLIST: f2fs: sanity check checkpoint segno and blkoff")

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@google.com>
parent deabce18

fs/f2fs/super.c

+14 −16
Original line number Diff line number Diff line
@@ -1892,8 +1892,8 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) 
	unsigned int total, fsmeta;

	struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi);

	struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);

	unsigned int main_segs, blocks_per_seg;

	unsigned int ovp_segments, reserved_segments;

	unsigned int main_segs, blocks_per_seg;

	int i;



	total = le32_to_cpu(raw_super->segment_count);
@@ -1906,29 +1906,27 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) 
	if (unlikely(fsmeta >= total))

		return 1;



	main_segs = le32_to_cpu(sbi->raw_super->segment_count_main);

	ovp_segments = le32_to_cpu(ckpt->overprov_segment_count);

	reserved_segments = le32_to_cpu(ckpt->rsvd_segment_count);



	if (unlikely(fsmeta < F2FS_MIN_SEGMENTS ||

			ovp_segments == 0 || reserved_segments == 0)) {

		f2fs_msg(sbi->sb, KERN_ERR,

			"Wrong layout: check mkfs.f2fs version");

		return 1;

	}



	main_segs = le32_to_cpu(raw_super->segment_count_main);

	blocks_per_seg = sbi->blocks_per_seg;



	for (i = 0; i < NR_CURSEG_NODE_TYPE; i++) {

		if (le32_to_cpu(ckpt->cur_node_segno[i]) >= main_segs ||

		    le16_to_cpu(ckpt->cur_node_blkoff[i]) >= blocks_per_seg) {

			le16_to_cpu(ckpt->cur_node_blkoff[i]) >= blocks_per_seg)

			return 1;

	}

	}

	for (i = 0; i < NR_CURSEG_DATA_TYPE; i++) {

		if (le32_to_cpu(ckpt->cur_data_segno[i]) >= main_segs ||

		    le16_to_cpu(ckpt->cur_data_blkoff[i]) >= blocks_per_seg) {

			return 1;

		}

	}



	ovp_segments = le32_to_cpu(ckpt->overprov_segment_count);

	reserved_segments = le32_to_cpu(ckpt->rsvd_segment_count);



	if (unlikely(fsmeta < F2FS_MIN_SEGMENTS ||

			ovp_segments == 0 || reserved_segments == 0)) {

		f2fs_msg(sbi->sb, KERN_ERR,

			"Wrong layout: check mkfs.f2fs version");

			le16_to_cpu(ckpt->cur_data_blkoff[i]) >= blocks_per_seg)

			return 1;

	}