Re: [PATCH 2/6] nullb: remove leftover legacy request code

[Hannes Reinecke]

On 11/9/18 7:32 PM, Christoph Hellwig wrote:
> 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.
> 
> Signed-off-by: Christoph Hellwig 
> ---
>  drivers/block/null_blk_main.c | 9 +++--
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
Reviewed-by: Hannes Reinecke 

Cheers,

Hannes
-- 
Dr. Hannes ReineckeTeamlead Storage & Networking
h...@suse.de   +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)

[PATCH 2/6] nullb: remove leftover legacy request code

[Christoph Hellwig]

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.

Signed-off-by: Christoph Hellwig 
---
 drivers/block/null_blk_main.c | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index 9c045bee0985..16ba3db2a015 100644
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -642,14 +642,11 @@ static void null_cmd_end_timer(struct nullb_cmd *cmd)
hrtimer_start(>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;
 
-   if (nullb->dev->queue_mode == NULL_Q_MQ)
-   end_cmd(blk_mq_rq_to_pdu(rq));
-   else
-   end_cmd(rq->special);
+   end_cmd(blk_mq_rq_to_pdu(rq));
 }
 
 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 = {
.queue_rq   = null_queue_rq,
-   .complete   = null_softirq_done_fn,
+   .complete   = null_complete_rq,
.timeout= null_timeout_rq,
 };
 
-- 
2.19.1

[PATCH 2/6] nullb: remove leftover legacy request code

[Christoph Hellwig]

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.

Signed-off-by: Christoph Hellwig 
---
 drivers/block/null_blk_main.c | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index 9c045bee0985..16ba3db2a015 100644
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -642,14 +642,11 @@ static void null_cmd_end_timer(struct nullb_cmd *cmd)
hrtimer_start(>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;
 
-   if (nullb->dev->queue_mode == NULL_Q_MQ)
-   end_cmd(blk_mq_rq_to_pdu(rq));
-   else
-   end_cmd(rq->special);
+   end_cmd(blk_mq_rq_to_pdu(rq));
 }
 
 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 = {
.queue_rq   = null_queue_rq,
-   .complete   = null_softirq_done_fn,
+   .complete   = null_complete_rq,
.timeout= null_timeout_rq,
 };
 
-- 
2.19.1