From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>,
Hannes Reinecke <hare@kernel.org>,
"James E.J. Bottomley" <jejb@linux.ibm.com>
Subject: [PATCH v2 31/50] myrs: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
Date: Tue, 18 May 2021 10:44:31 -0700 [thread overview]
Message-ID: <20210518174450.20664-32-bvanassche@acm.org> (raw)
In-Reply-To: <20210518174450.20664-1-bvanassche@acm.org>
Prepare for removal of the request pointer by using scsi_cmd_to_rq()
instead. This patch does not change any functionality.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/myrs.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
index 3b68c68d1716..9b3090d59bb9 100644
--- a/drivers/scsi/myrs.c
+++ b/drivers/scsi/myrs.c
@@ -1582,6 +1582,7 @@ static void myrs_mode_sense(struct myrs_hba *cs, struct scsi_cmnd *scmd,
static int myrs_queuecommand(struct Scsi_Host *shost,
struct scsi_cmnd *scmd)
{
+ struct request *rq = scsi_cmd_to_rq(scmd);
struct myrs_hba *cs = shost_priv(shost);
struct myrs_cmdblk *cmd_blk = scsi_cmd_priv(scmd);
union myrs_cmd_mbox *mbox = &cmd_blk->mbox;
@@ -1633,7 +1634,7 @@ static int myrs_queuecommand(struct Scsi_Host *shost,
return SCSI_MLQUEUE_HOST_BUSY;
cmd_blk->sense_addr = sense_addr;
- timeout = scmd->request->timeout;
+ timeout = rq->timeout;
if (scmd->cmd_len <= 10) {
if (scmd->device->channel >= cs->ctlr_info->physchan_present) {
struct myrs_ldev_info *ldev_info = sdev->hostdata;
@@ -1649,10 +1650,10 @@ static int myrs_queuecommand(struct Scsi_Host *shost,
mbox->SCSI_10.pdev.target = sdev->id;
mbox->SCSI_10.pdev.channel = sdev->channel;
}
- mbox->SCSI_10.id = scmd->request->tag + 3;
+ mbox->SCSI_10.id = rq->tag + 3;
mbox->SCSI_10.control.dma_ctrl_to_host =
(scmd->sc_data_direction == DMA_FROM_DEVICE);
- if (scmd->request->cmd_flags & REQ_FUA)
+ if (rq->cmd_flags & REQ_FUA)
mbox->SCSI_10.control.fua = true;
mbox->SCSI_10.dma_size = scsi_bufflen(scmd);
mbox->SCSI_10.sense_addr = cmd_blk->sense_addr;
@@ -1695,10 +1696,10 @@ static int myrs_queuecommand(struct Scsi_Host *shost,
mbox->SCSI_255.pdev.target = sdev->id;
mbox->SCSI_255.pdev.channel = sdev->channel;
}
- mbox->SCSI_255.id = scmd->request->tag + 3;
+ mbox->SCSI_255.id = rq->tag + 3;
mbox->SCSI_255.control.dma_ctrl_to_host =
(scmd->sc_data_direction == DMA_FROM_DEVICE);
- if (scmd->request->cmd_flags & REQ_FUA)
+ if (rq->cmd_flags & REQ_FUA)
mbox->SCSI_255.control.fua = true;
mbox->SCSI_255.dma_size = scsi_bufflen(scmd);
mbox->SCSI_255.sense_addr = cmd_blk->sense_addr;
next prev parent reply other threads:[~2021-05-18 17:45 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 17:44 [PATCH v2 00/50] Remove the request pointer from struct scsi_cmnd Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 01/50] core: Introduce the scsi_cmd_to_rq() function Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 02/50] core: Use scsi_cmd_to_rq() instead of scsi_cmnd.request Bart Van Assche
2021-05-18 20:01 ` Douglas Gilbert
2021-05-18 21:59 ` Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 03/50] sd: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 04/50] sr: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 05/50] scsi_transport_fc: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 06/50] scsi_transport_spi: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 07/50] ata: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 08/50] RDMA/iser: " Bart Van Assche
2021-05-18 17:58 ` Sagi Grimberg
2021-05-18 17:44 ` [PATCH v2 09/50] RDMA/srp: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 10/50] zfcp: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 11/50] 53c700: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 12/50] NCR5380: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 13/50] aacraid: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 14/50] advansys: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 15/50] bnx2i: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 16/50] csiostor: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 17/50] cxlflash: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 18/50] dpt_i2o: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 19/50] fnic: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 20/50] hisi_sas: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 21/50] hpsa: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 22/50] ibmvfc: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 23/50] ibmvscsi: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 24/50] ips: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 25/50] libsas: " Bart Van Assche
2021-05-19 10:12 ` John Garry
2021-05-18 17:44 ` [PATCH v2 26/50] lpfc: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 27/50] megaraid: " Bart Van Assche
2021-05-19 7:43 ` Sumit Saxena
2021-05-18 17:44 ` [PATCH v2 28/50] mpt3sas: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 29/50] mvumi: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 30/50] myrb: " Bart Van Assche
2021-05-18 17:44 ` Bart Van Assche [this message]
2021-05-18 17:44 ` [PATCH v2 32/50] ncr53c8xx: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 33/50] qedf: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 34/50] qedi: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 35/50] qla1280: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 36/50] qla2xxx: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 37/50] qla4xxx: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 38/50] qlogicpti: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 39/50] scsi_debug: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 40/50] smartpqi: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 41/50] snic: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 42/50] stex: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 43/50] sun3_scsi: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 44/50] sym53c8xx: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 45/50] ufs: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 46/50] virtio_scsi: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 47/50] xen-scsifront: " Bart Van Assche
2021-05-19 9:20 ` Juergen Gross
2021-05-18 17:44 ` [PATCH v2 48/50] tcm_loop: " Bart Van Assche
2021-05-19 18:14 ` Bodo Stroesser
2021-05-18 17:44 ` [PATCH v2 49/50] usb-storage: " Bart Van Assche
2021-05-18 17:44 ` [PATCH v2 50/50] core: Remove the request member from struct scsi_cmnd Bart Van Assche
2021-05-18 17:55 ` [PATCH v2 00/50] Remove the request pointer " James Bottomley
2021-05-18 21:21 ` Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210518174450.20664-32-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=hare@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox