diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-09-27 21:01:51 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-10-01 10:10:57 +0200 |
| commit | 0bf6cd5b9531bcc29c0a5e504b6ce2984c6fd8d8 (patch) | |
| tree | bf6d257b11c79cda7f8f44e3fd8d9c535143fdfd /block/blk-mq-tag.c | |
| parent | f4829a9b7a61e159367350008a608b062c4f6840 (diff) | |
| download | linux-stable-0bf6cd5b9531bcc29c0a5e504b6ce2984c6fd8d8.tar.gz linux-stable-0bf6cd5b9531bcc29c0a5e504b6ce2984c6fd8d8.tar.bz2 linux-stable-0bf6cd5b9531bcc29c0a5e504b6ce2984c6fd8d8.zip | |
blk-mq: factor out a helper to iterate all tags for a request_queue
And replace the blk_mq_tag_busy_iter with it - the driver use has been
replaced with a new helper a while ago, and internal to the block we
only need the new version.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-mq-tag.c')
| -rw-r--r-- | block/blk-mq-tag.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 9115c6d59948..ed96474d75cb 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -471,17 +471,30 @@ void blk_mq_all_tag_busy_iter(struct blk_mq_tags *tags, busy_tag_iter_fn *fn, } EXPORT_SYMBOL(blk_mq_all_tag_busy_iter); -void blk_mq_tag_busy_iter(struct blk_mq_hw_ctx *hctx, busy_iter_fn *fn, +void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, void *priv) { - struct blk_mq_tags *tags = hctx->tags; + struct blk_mq_hw_ctx *hctx; + int i; + + + queue_for_each_hw_ctx(q, hctx, i) { + struct blk_mq_tags *tags = hctx->tags; + + /* + * If not software queues are currently mapped to this + * hardware queue, there's nothing to check + */ + if (!blk_mq_hw_queue_mapped(hctx)) + continue; + + if (tags->nr_reserved_tags) + bt_for_each(hctx, &tags->breserved_tags, 0, fn, priv, true); + bt_for_each(hctx, &tags->bitmap_tags, tags->nr_reserved_tags, fn, priv, + false); + } - if (tags->nr_reserved_tags) - bt_for_each(hctx, &tags->breserved_tags, 0, fn, priv, true); - bt_for_each(hctx, &tags->bitmap_tags, tags->nr_reserved_tags, fn, priv, - false); } -EXPORT_SYMBOL(blk_mq_tag_busy_iter); static unsigned int bt_unused_tags(struct blk_mq_bitmap_tags *bt) { |