diff options
| author | Jens Axboe <axboe@fb.com> | 2014-11-24 15:52:30 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-11-24 15:52:30 -0700 |
| commit | 70114c393ccaa43ca38e6b36b9469ed2c35acc49 (patch) | |
| tree | f14673ccf7172de39888c18a5e201e9f5dcf0c53 /block | |
| parent | a33c1ba2913802b6fb23e974bb2f6a4e73c8b7ce (diff) | |
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: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-tag.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 8317175a300..230ef3056b7 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -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, |