leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nullb: remove leftover legacy request code

Browse Source 
null_softirq_done_fn is only used for the blk-mq path, so remove the
other branch.  Also rename the function to better match the method name.

Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-11-10 09:30:45 +01:00 committed by Jens Axboe
parent 511c49fe18
commit 49f6613632
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/block/null_blk_main.c
View File

@ -642,14 +642,11 @@ static void null_cmd_end_timer(struct nullb_cmd *cmd)
hrtimer_start(&cmd->timer, kt, HRTIMER_MODE_REL); hrtimer_start(&cmd->timer, kt, HRTIMER_MODE_REL);
} }
static void null_softirq_done_fn(struct request *rq) static void null_complete_rq(struct request *rq)
{ {
struct nullb *nullb = rq->q->queuedata; struct nullb *nullb = rq->q->queuedata;
if (nullb->dev->queue_mode == NULL_Q_MQ) end_cmd(blk_mq_rq_to_pdu(rq));
end_cmd(blk_mq_rq_to_pdu(rq));
else
end_cmd(rq->special);
} }
static struct nullb_page *null_alloc_page(gfp_t gfp_flags) static struct nullb_page *null_alloc_page(gfp_t gfp_flags)
@ -1357,7 +1354,7 @@ static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx,
static const struct blk_mq_ops null_mq_ops = { static const struct blk_mq_ops null_mq_ops = {
.queue_rq = null_queue_rq, .queue_rq = null_queue_rq,
.complete = null_softirq_done_fn, .complete = null_complete_rq,
.timeout = null_timeout_rq, .timeout = null_timeout_rq,
}; };