stmmac: pci: set default of the filter bins

[cascardo/linux.git] / drivers / block / null_blk.c

diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 00d469c..2671a3f 100644 (file)
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -177,7 +177,7 @@ static void end_cmd(struct nullb_cmd *cmd)
 {
        switch (queue_mode)  {
        case NULL_Q_MQ:
-               blk_mq_end_io(cmd->rq, 0);
+               blk_mq_end_request(cmd->rq, 0);
                return;
        case NULL_Q_RQ:
                INIT_LIST_HEAD(&cmd->rq->queuelist);
@@ -313,13 +313,16 @@ static void null_request_fn(struct request_queue *q)
        }
 }
 
-static int null_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *rq)
+static int null_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *rq,
+               bool last)
 {
        struct nullb_cmd *cmd = blk_mq_rq_to_pdu(rq);
 
        cmd->rq = rq;
        cmd->nq = hctx->driver_data;
 
+       blk_mq_start_request(rq);
+
        null_handle_cmd(cmd);
        return BLK_MQ_RQ_QUEUE_OK;
 }
@@ -518,6 +521,7 @@ static int null_add_dev(void)
 
        nullb->q->queuedata = nullb;
        queue_flag_set_unlocked(QUEUE_FLAG_NONROT, nullb->q);
+       queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, nullb->q);
 
        disk = nullb->disk = alloc_disk_node(1, home_node);
        if (!disk) {