block, scsi: move the retries field to struct scsi_request

Instead of bloating the generic struct request with it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

7 files changed, 8 insertions, 8 deletions

diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 6903f03c88af..9d0727b2bdec 100644
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -1602,7 +1602,7 @@ static int _init_blk_request(struct osd_request *or,
         req->rq_flags |= RQF_QUIET;
 
         req->timeout = or->timeout;
-        req->retries = or->retries;
+        scsi_req(req)->retries = or->retries;
 
         if (has_out) {
                 or->out.req = req;
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index c47f4b349bac..41bc1d64bf86 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -414,7 +414,7 @@ static int osst_execute(struct osst_request *SRpnt, const unsigned char *cmd,
         memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
         memcpy(rq->cmd, cmd, rq->cmd_len);
         req->timeout = timeout;
-        req->retries = retries;
+        rq->retries = retries;
         req->end_io_data = SRpnt;
 
         blk_execute_rq_nowait(req->q, NULL, req, 1, osst_end_async);
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index f2cafae150bc..2db412dd4b44 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1988,7 +1988,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev)
 
         req->rq_flags |= RQF_QUIET;
         req->timeout = 10 * HZ;
-        req->retries = 5;
+        rq->retries = 5;
 
         blk_execute_rq_nowait(req->q, NULL, req, 1, eh_lock_door_done);
 }
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index c1519660824b..11972d1075f1 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -256,7 +256,7 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
 
         rq->cmd_len = COMMAND_SIZE(cmd[0]);
         memcpy(rq->cmd, cmd, rq->cmd_len);
-        req->retries = retries;
+        rq->retries = retries;
         req->timeout = timeout;
         req->cmd_flags |= flags;
         req->rq_flags |= rq_flags | RQF_QUIET | RQF_PREEMPT;
@@ -1177,7 +1177,7 @@ static int scsi_setup_scsi_cmnd(struct scsi_device *sdev, struct request *req)
         cmd->cmd_len = scsi_req(req)->cmd_len;
         cmd->cmnd = scsi_req(req)->cmd;
         cmd->transfersize = blk_rq_bytes(req);
-        cmd->allowed = req->retries;
+        cmd->allowed = scsi_req(req)->retries;
         return BLKPREP_OK;
 }
 
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 29b86505f796..b61cc3c512d3 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1716,7 +1716,7 @@ sg_start_req(Sg_request *srp, unsigned char *cmd)
 
         srp->rq = rq;
         rq->end_io_data = srp;
-        rq->retries = SG_DEFAULT_RETRIES;
+        req->retries = SG_DEFAULT_RETRIES;
 
         if ((dxfer_len <= 0) || (dxfer_dir == SG_DXFER_NONE))
                 return 0;
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index e5ef78a6848e..5408643431bb 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -579,7 +579,7 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd,
         memset(rq->cmd, 0, BLK_MAX_CDB);
         memcpy(rq->cmd, cmd, rq->cmd_len);
         req->timeout = timeout;
-        req->retries = retries;
+        rq->retries = retries;
         req->end_io_data = SRpnt;
 
         blk_execute_rq_nowait(req->q, NULL, req, 1, st_scsi_execute_end);
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index 94cda7991e80..c7fa372c527a 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -1008,7 +1008,7 @@ pscsi_execute_cmd(struct se_cmd *cmd)
                 req->timeout = PS_TIMEOUT_DISK;
         else
                 req->timeout = PS_TIMEOUT_OTHER;
-        req->retries = PS_RETRY;
+        scsi_req(req)->retries = PS_RETRY;
 
         blk_execute_rq_nowait(pdv->pdv_sd->request_queue, NULL, req,
                         (cmd->sam_task_attr == TCM_HEAD_TAG),