Merge tag 'fpga-fixes-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf...

[linux-2.6-block.git] / block / blk-softirq.c

diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index e47a2f751884ddb7821fededef643693db752393..457d9ba3eb204df3af1fe6a633b2a2ddc44ccd85 100644 (file)
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -34,7 +34,7 @@ static __latent_entropy void blk_done_softirq(struct softirq_action *h)
 
                rq = list_entry(local_list.next, struct request, ipi_list);
                list_del_init(&rq->ipi_list);
-               rq->q->softirq_done_fn(rq);
+               rq->q->mq_ops->complete(rq);
        }
 }
 
@@ -98,11 +98,11 @@ static int blk_softirq_cpu_dead(unsigned int cpu)
 void __blk_complete_request(struct request *req)
 {
        struct request_queue *q = req->q;
-       int cpu, ccpu = q->mq_ops ? req->mq_ctx->cpu : req->cpu;
+       int cpu, ccpu = req->mq_ctx->cpu;
        unsigned long flags;
        bool shared = false;
 
-       BUG_ON(!q->softirq_done_fn);
+       BUG_ON(!q->mq_ops->complete);
 
        local_irq_save(flags);
        cpu = smp_processor_id();
@@ -143,27 +143,6 @@ do_local:
 
        local_irq_restore(flags);
 }
-EXPORT_SYMBOL(__blk_complete_request);
-
-/**
- * blk_complete_request - end I/O on a request
- * @req:      the request being processed
- *
- * Description:
- *     Ends all I/O on a request. It does not handle partial completions,
- *     unless the driver actually implements this in its completion callback
- *     through requeueing. The actual completion happens out-of-order,
- *     through a softirq handler. The user must have registered a completion
- *     callback through blk_queue_softirq_done().
- **/
-void blk_complete_request(struct request *req)
-{
-       if (unlikely(blk_should_fake_timeout(req->q)))
-               return;
-       if (!blk_mark_rq_complete(req))
-               __blk_complete_request(req);
-}
-EXPORT_SYMBOL(blk_complete_request);
 
 static __init int blk_softirq_init(void)
 {