Unverified Commit 6ea4c7da authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10466 null_blk: fix validation of block size 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DYITLIEWOW6SUX7IG7JF6WZH6OPWQ5FT/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEMW 
 
Link:https://gitee.com/openeuler/kernel/pulls/10466

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents df93fd12 c374d415

drivers/block/null_blk/main.c

+2 −2
Original line number Diff line number Diff line
@@ -2029,8 +2029,8 @@ static int null_validate_conf(struct nullb_device *dev) 
		return -EINVAL;

	}



	dev->blocksize = round_down(dev->blocksize, 512);

	dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096);

	if (blk_validate_block_size(dev->blocksize))

		return -EINVAL;



	if (dev->queue_mode == NULL_Q_MQ && dev->use_per_node_hctx) {

		if (dev->submit_queues != nr_online_nodes)