Commit 3494cec3 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Zheng Zengkai
Browse files

blk-mq: Always use blk_mq_is_sbitmap_shared 

mainline inclusion
from mainline-v5.13-rc1
commit 39aa56db
category: performance
bugzilla: 186917, https://gitee.com/openeuler/kernel/issues/I5N1S5
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=39aa56db50b9ca5cad597e561b4b160b6cbbb65b



--------------------------------

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Link: https://lore.kernel.org/r/20210311081713.2763171-1-nborisov@suse.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent b3260e04

block/blk-mq-tag.c

+2 −2
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ struct blk_mq_tags *blk_mq_init_tags(unsigned int total_tags, 
	tags->nr_reserved_tags = reserved_tags;

	spin_lock_init(&tags->lock);



	if (flags & BLK_MQ_F_TAG_HCTX_SHARED)

	if (blk_mq_is_sbitmap_shared(flags))

		return tags;



	if (blk_mq_init_bitmap_tags(tags, node, alloc_policy) < 0) {
@@ -636,7 +636,7 @@ struct blk_mq_tags *blk_mq_init_tags(unsigned int total_tags, 


void blk_mq_free_tags(struct blk_mq_tags *tags, unsigned int flags)

{

	if (!(flags & BLK_MQ_F_TAG_HCTX_SHARED)) {

	if (!blk_mq_is_sbitmap_shared(flags)) {

		sbitmap_queue_free(tags->bitmap_tags);

		sbitmap_queue_free(tags->breserved_tags);

	}