diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-06-15 08:11:05 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-06-15 08:11:05 -0600 |
| commit | 95c7c09f4cc8ac3cfbcf4382ff3f7ecfd97e8ed6 (patch) | |
| tree | 3a00cd194fdc14c38edb01aadd49dea56b336ab8 /block | |
| parent | da661267398869a553b7f67d739d360aaa1361b6 (diff) | |
| parent | 35897b920c8ab5e23331ad429e0aa235528c63ba (diff) | |
| download | linux-rpi3-95c7c09f4cc8ac3cfbcf4382ff3f7ecfd97e8ed6.tar.gz linux-rpi3-95c7c09f4cc8ac3cfbcf4382ff3f7ecfd97e8ed6.tar.bz2 linux-rpi3-95c7c09f4cc8ac3cfbcf4382ff3f7ecfd97e8ed6.zip | |
Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-linus
Pull NVMe fixes from Christoph:
"Fix various little regressions introduced in this merge window, plus
a rework of the fibre channel connect and reconnect path to share the
code instead of having separate sets of bugs. Last but not least a
trivial trace point addition from Hannes."
* 'nvme-4.18' of git://git.infradead.org/nvme:
nvme-fabrics: fix and refine state checks in __nvmf_check_ready
nvme-fabrics: handle the admin-only case properly in nvmf_check_ready
nvme-fabrics: refactor queue ready check
blk-mq: remove blk_mq_tagset_iter
nvme: remove nvme_reinit_tagset
nvme-fc: fix nulling of queue data on reconnect
nvme-fc: remove reinit_request routine
nvme-fc: change controllers first connect to use reconnect path
nvme: don't rely on the changed namespace list log
nvmet: free smart-log buffer after use
nvme-rdma: fix error flow during mapping request data
nvme: add bio remapping tracepoint
nvme: fix NULL pointer dereference in nvme_init_subsystem
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-tag.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 70356a2a11ab..09b2ee6694fb 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -311,35 +311,6 @@ void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset, } EXPORT_SYMBOL(blk_mq_tagset_busy_iter); -int blk_mq_tagset_iter(struct blk_mq_tag_set *set, void *data, - int (fn)(void *, struct request *)) -{ - int i, j, ret = 0; - - if (WARN_ON_ONCE(!fn)) - goto out; - - for (i = 0; i < set->nr_hw_queues; i++) { - struct blk_mq_tags *tags = set->tags[i]; - - if (!tags) - continue; - - for (j = 0; j < tags->nr_tags; j++) { - if (!tags->static_rqs[j]) - continue; - - ret = fn(data, tags->static_rqs[j]); - if (ret) - goto out; - } - } - -out: - return ret; -} -EXPORT_SYMBOL_GPL(blk_mq_tagset_iter); - void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, void *priv) { |