diff options
| author | Jens Axboe <axboe@fb.com> | 2017-05-26 09:11:19 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-05-26 09:11:19 -0600 |
| commit | 8aa6382907fa495e6b8b8184b53e36d142ffd8da (patch) | |
| tree | 16a22fc90548ee3edcb6e3ed1ffe4aa247bcadf2 /block | |
| parent | a8ecdd7117ee68fe27009acc8021423870c1dcd7 (diff) | |
| parent | 50af47d04ca530544b27affffb0722f158e2bb9c (diff) | |
| download | linux-8aa6382907fa495e6b8b8184b53e36d142ffd8da.tar.bz2 | |
Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-linus
Christoph writes:
"A couple of fixes for the next rc on the nvme front. Various FC fixes
from James, controller removal fixes from Ming (including a block layer
patch), a APST related device quirk from Andy, a RDMA fix for small
queue depth device from Marta, as well as fixes for the lack of
metadata support in non-PCIe drivers and the printk logging format from
me."
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index a69ad122ed66..f2224ffd225d 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -628,25 +628,6 @@ void blk_mq_delay_kick_requeue_list(struct request_queue *q, } EXPORT_SYMBOL(blk_mq_delay_kick_requeue_list); -void blk_mq_abort_requeue_list(struct request_queue *q) -{ - unsigned long flags; - LIST_HEAD(rq_list); - - spin_lock_irqsave(&q->requeue_lock, flags); - list_splice_init(&q->requeue_list, &rq_list); - spin_unlock_irqrestore(&q->requeue_lock, flags); - - while (!list_empty(&rq_list)) { - struct request *rq; - - rq = list_first_entry(&rq_list, struct request, queuelist); - list_del_init(&rq->queuelist); - blk_mq_end_request(rq, -EIO); - } -} -EXPORT_SYMBOL(blk_mq_abort_requeue_list); - struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, unsigned int tag) { if (tag < tags->nr_tags) { |