1 files changed, 19 insertions, 5 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index db8c449282f9..9eff8a375132 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -221,7 +221,7 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
         int ret = DRIVER_ERROR << 24;
 
         req = blk_get_request(sdev->request_queue, write, __GFP_WAIT);
-        if (!req)
+        if (IS_ERR(req))
                 return ret;
         blk_rq_set_block_pc(req);
 
@@ -715,7 +715,7 @@ static bool scsi_end_request(struct request *req, int error,
 
         if (req->mq_ctx) {
                 /*
-                 * In the MQ case the command gets freed by __blk_mq_end_io,
+                 * In the MQ case the command gets freed by __blk_mq_end_request,
                  * so we have to do all cleanup that depends on it earlier.
                  *
                  * We also can't kick the queues from irq context, so we
@@ -723,7 +723,7 @@ static bool scsi_end_request(struct request *req, int error,
                  */
                 scsi_mq_uninit_cmd(cmd);
 
-                __blk_mq_end_io(req, error);
+                __blk_mq_end_request(req, error);
 
                 if (scsi_target(sdev)->single_lun ||
                     !list_empty(&sdev->host->starved_list))
@@ -1847,6 +1847,8 @@ static int scsi_mq_prep_fn(struct request *req)
                 next_rq->special = bidi_sdb;
         }
 
+        blk_mq_start_request(req);
+
         return scsi_setup_cmnd(sdev, req);
 }
 
@@ -1856,7 +1858,8 @@ static void scsi_mq_done(struct scsi_cmnd *cmd)
         blk_mq_complete_request(cmd->request);
 }
 
-static int scsi_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req)
+static int scsi_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req,
+                bool last)
 {
         struct request_queue *q = req->q;
         struct scsi_device *sdev = q->queuedata;
@@ -1880,11 +1883,14 @@ static int scsi_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req)
         if (!scsi_host_queue_ready(q, shost, sdev))
                 goto out_dec_target_busy;
 
+
         if (!(req->cmd_flags & REQ_DONTPREP)) {
                 ret = prep_to_mq(scsi_mq_prep_fn(req));
                 if (ret)
                         goto out_dec_host_busy;
                 req->cmd_flags |= REQ_DONTPREP;
+        } else {
+                blk_mq_start_request(req);
         }
 
         scsi_init_cmd_errh(cmd);
@@ -1931,6 +1937,14 @@ out:
         return ret;
 }
 
+static enum blk_eh_timer_return scsi_timeout(struct request *req,
+                bool reserved)
+{
+        if (reserved)
+                return BLK_EH_RESET_TIMER;
+        return scsi_times_out(req);
+}
+
 static int scsi_init_request(void *data, struct request *rq,
                 unsigned int hctx_idx, unsigned int request_idx,
                 unsigned int numa_node)
@@ -2042,7 +2056,7 @@ static struct blk_mq_ops scsi_mq_ops = {
         .map_queue      = blk_mq_map_queue,
         .queue_rq       = scsi_queue_rq,
         .complete       = scsi_softirq_done,
-        .timeout        = scsi_times_out,
+        .timeout        = scsi_timeout,
         .init_request   = scsi_init_request,
         .exit_request   = scsi_exit_request,
 };