aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/osst.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-04-05 19:18:12 +0200
committerJens Axboe <axboe@fb.com>2017-04-05 12:05:08 -0600
commit64c7f1d1572cacadfc0a4ca5a937aeffa486de58 (patch)
tree9b6a5030c06ba94e629e1411bebdb01b1735de78 /drivers/scsi/osst.c
parentnvme: move the retries count to struct nvme_request (diff)
downloadlinux-dev-64c7f1d1572cacadfc0a4ca5a937aeffa486de58.tar.xz
linux-dev-64c7f1d1572cacadfc0a4ca5a937aeffa486de58.zip
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>
Diffstat (limited to 'drivers/scsi/osst.c')
-rw-r--r--drivers/scsi/osst.c2
1 files changed, 1 insertions, 1 deletions
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);