Commit 4d063237 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Jens Axboe
Browse files

blk-mq: Free tags in blk_mq_init_tags() upon error 



Since the tags are allocated in blk_mq_init_tags(), it's better practice
to free in that same function upon error, rather than a callee which is to
init the bitmap tags (blk_mq_init_tags()).

[jpg: Split from an earlier patch with a new commit message]

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Tested-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 655ac300

block/blk-mq-tag.c

+10 −8
Original line number Diff line number Diff line
@@ -429,24 +429,22 @@ static int bt_alloc(struct sbitmap_queue *bt, unsigned int depth, 
				       node);

}



static struct blk_mq_tags *blk_mq_init_bitmap_tags(struct blk_mq_tags *tags,

static int blk_mq_init_bitmap_tags(struct blk_mq_tags *tags,

				   int node, int alloc_policy)

{

	unsigned int depth = tags->nr_tags - tags->nr_reserved_tags;

	bool round_robin = alloc_policy == BLK_TAG_ALLOC_RR;



	if (bt_alloc(&tags->bitmap_tags, depth, round_robin, node))

		goto free_tags;

		return -ENOMEM;

	if (bt_alloc(&tags->breserved_tags, tags->nr_reserved_tags, round_robin,

		     node))

		goto free_bitmap_tags;



	return tags;

	return 0;

free_bitmap_tags:

	sbitmap_queue_free(&tags->bitmap_tags);

free_tags:

	kfree(tags);

	return NULL;

	return -ENOMEM;

}



struct blk_mq_tags *blk_mq_init_tags(unsigned int total_tags,
@@ -467,7 +465,11 @@ struct blk_mq_tags *blk_mq_init_tags(unsigned int total_tags, 
	tags->nr_tags = total_tags;

	tags->nr_reserved_tags = reserved_tags;



	return blk_mq_init_bitmap_tags(tags, node, alloc_policy);

	if (blk_mq_init_bitmap_tags(tags, node, alloc_policy) < 0) {

		kfree(tags);

		return NULL;

	}

	return tags;

}



void blk_mq_free_tags(struct blk_mq_tags *tags)