summaryrefslogtreecommitdiff
path: root/block/blk-softirq.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2018-10-31 18:43:30 +0300
committerJens Axboe <axboe@kernel.dk>2018-11-07 23:42:33 +0300
commitc7bb9ad1744ea14e61e5fff99ee5282709b0c9d9 (patch)
tree473721096fed4efbe49ff19fd1f5efa6da9bf00e /block/blk-softirq.c
parent7d692330e7cd581ccfee982334bf06b236cb999a (diff)
downloadlinux-c7bb9ad1744ea14e61e5fff99ee5282709b0c9d9.tar.xz
block: get rid of q->softirq_done_fn()
With the legacy path gone, all we do is funnel it through the mq_ops->complete() operation. Tested-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-softirq.c')
-rw-r--r--block/blk-softirq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index 8ca0f6caf174..727d64436ec4 100644
--- 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);
}
}
@@ -102,7 +102,7 @@ void __blk_complete_request(struct request *req)
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();