Unverified Commit 40f68978 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11411 f2fs: fix null reference error when checking end of zone 

Merge Pull Request from: @ci-robot 
 
PR sync from: Kaixiong Yu <yukaixiong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RBU32SXQJZGJILMXNZGTV7FJX2YITFSX/ 
 
https://gitee.com/src-openeuler/kernel/issues/381cbe85592c78fbaeb3e770e3e9f3bfa3e67efb 
 
Link:https://gitee.com/openeuler/kernel/pulls/11411

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 833e2e8d 8401c48d

fs/f2fs/data.c

+3 −1
Original line number Diff line number Diff line
@@ -924,6 +924,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio) 
#ifdef CONFIG_BLK_DEV_ZONED

static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr)

{

	struct block_device *bdev = sbi->sb->s_bdev;

	int devi = 0;



	if (f2fs_is_multi_device(sbi)) {
@@ -934,8 +935,9 @@ static bool is_end_zone_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr) 
			return false;

		}

		blkaddr -= FDEV(devi).start_blk;

                bdev = FDEV(devi).bdev;

	}

	return bdev_zoned_model(FDEV(devi).bdev) == BLK_ZONED_HM &&

	return bdev_zoned_model(bdev) == BLK_ZONED_HM &&

		f2fs_blkz_is_seq(sbi, devi, blkaddr) &&

		(blkaddr % sbi->blocks_per_blkz == sbi->blocks_per_blkz - 1);

}