From: Nikolay Borisov <nborisov@suse.com>
Date: Thu, 11 Mar 2021 08:17:13 +0000 (+0200)
Subject: blk-mq: Always use blk_mq_is_sbitmap_shared
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=39aa56db50b9ca5cad597e561b4b160b6cbbb65b;p=linux.git

blk-mq: Always use blk_mq_is_sbitmap_shared

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Link: https://lore.kernel.org/r/20210311081713.2763171-1-nborisov@suse.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index e5bfecf2940d9..2a37731e8244b 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -517,7 +517,7 @@ struct blk_mq_tags *blk_mq_init_tags(unsigned int total_tags,
 	tags->nr_tags = total_tags;
 	tags->nr_reserved_tags = reserved_tags;
 
-	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) {
@@ -529,7 +529,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);
 	}