Commit 70114c39 authored by Jens Axboe's avatar Jens Axboe
Browse files

blk-mq: cleanup tag free handling 



We only call __blk_mq_put_tag() and __blk_mq_put_reserved_tag()
from blk_mq_put_tag(), so just inline the two calls instead of
having them as separate functions.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent a33c1ba2

block/blk-mq-tag.c

+6 −18
Original line number Diff line number Diff line
@@ -360,21 +360,6 @@ static void bt_clear_tag(struct blk_mq_bitmap_tags *bt, unsigned int tag) 
	}

}



static void __blk_mq_put_tag(struct blk_mq_tags *tags, unsigned int tag)

{

	BUG_ON(tag >= tags->nr_tags);



	bt_clear_tag(&tags->bitmap_tags, tag);

}



static void __blk_mq_put_reserved_tag(struct blk_mq_tags *tags,

				      unsigned int tag)

{

	BUG_ON(tag >= tags->nr_reserved_tags);



	bt_clear_tag(&tags->breserved_tags, tag);

}



void blk_mq_put_tag(struct blk_mq_hw_ctx *hctx, unsigned int tag,

		    unsigned int *last_tag)

{
@@ -383,10 +368,13 @@ void blk_mq_put_tag(struct blk_mq_hw_ctx *hctx, unsigned int tag, 
	if (tag >= tags->nr_reserved_tags) {

		const int real_tag = tag - tags->nr_reserved_tags;



		__blk_mq_put_tag(tags, real_tag);

		BUG_ON(real_tag >= tags->nr_tags);

		bt_clear_tag(&tags->bitmap_tags, real_tag);

		*last_tag = real_tag;

	} else

		__blk_mq_put_reserved_tag(tags, tag);

	} else {

		BUG_ON(tag >= tags->nr_reserved_tags);

		bt_clear_tag(&tags->breserved_tags, tag);

	}

}



static void bt_for_each(struct blk_mq_hw_ctx *hctx,