Commit 7edfd681 authored by Jinlong Chen's avatar Jinlong Chen Committed by Jens Axboe
Browse files

blk-mq: improve error handling in blk_mq_alloc_rq_map() 



Use goto-style error handling like we do elsewhere in the kernel.

Signed-off-by: default avatarJinlong Chen <nickyc975@zju.edu.cn>
Link: https://lore.kernel.org/r/bbbc2d9b17b137798c7fb92042141ca4cbbc58cc.1667356813.git.nickyc975@zju.edu.cn


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 98d81f0d

block/blk-mq.c

+10 −9
Original line number Diff line number Diff line
@@ -3305,23 +3305,24 @@ static struct blk_mq_tags *blk_mq_alloc_rq_map(struct blk_mq_tag_set *set, 
	tags->rqs = kcalloc_node(nr_tags, sizeof(struct request *),

				 GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY,

				 node);

	if (!tags->rqs) {

		blk_mq_free_tags(tags);

		return NULL;

	}

	if (!tags->rqs)

		goto err_free_tags;



	tags->static_rqs = kcalloc_node(nr_tags, sizeof(struct request *),

					GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY,

					node);

	if (!tags->static_rqs) {

	if (!tags->static_rqs)

		goto err_free_rqs;



	return tags;



err_free_rqs:

	kfree(tags->rqs);

err_free_tags:

	blk_mq_free_tags(tags);

	return NULL;

}



	return tags;

}



static int blk_mq_init_request(struct blk_mq_tag_set *set, struct request *rq,

			       unsigned int hctx_idx, int node)

{