From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
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 v3 32/51] myrs: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
Date: Sun, 23 May 2021 20:08:37 -0700 [thread overview]
Message-ID: <20210524030856.2824-33-bvanassche@acm.org> (raw)
In-Reply-To: <20210524030856.2824-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-24 3:10 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-24 3:08 [PATCH v3 00/51] Remove the request pointer from struct scsi_cmnd Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 01/51] core: Introduce the scsi_cmd_to_rq() function Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 02/51] core: Use scsi_cmd_to_rq() instead of scsi_cmnd.request Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 03/51] sd: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 04/51] sr: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 05/51] scsi_transport_fc: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 06/51] scsi_transport_spi: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 07/51] ata: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 08/51] RDMA/iser: " Bart Van Assche
2021-05-24 8:46 ` Max Gurtovoy
2021-05-24 3:08 ` [PATCH v3 09/51] RDMA/srp: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 10/51] zfcp: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 11/51] 53c700: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 12/51] NCR5380: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 13/51] aacraid: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 14/51] advansys: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 15/51] aha1542: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 16/51] bnx2i: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 17/51] csiostor: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 18/51] cxlflash: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 19/51] dpt_i2o: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 20/51] fnic: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 21/51] hisi_sas: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 22/51] hpsa: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 23/51] ibmvfc: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 24/51] ibmvscsi: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 25/51] ips: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 26/51] libsas: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 27/51] lpfc: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 28/51] megaraid: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 29/51] mpt3sas: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 30/51] mvumi: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 31/51] myrb: " Bart Van Assche
2021-05-24 3:08 ` Bart Van Assche [this message]
2021-05-24 3:08 ` [PATCH v3 33/51] ncr53c8xx: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 34/51] qedf: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 35/51] qedi: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 36/51] qla1280: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 37/51] qla2xxx: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 38/51] qla4xxx: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 39/51] qlogicpti: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 40/51] scsi_debug: " Bart Van Assche
2021-05-25 16:19 ` Douglas Gilbert
2021-05-24 3:08 ` [PATCH v3 41/51] smartpqi: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 42/51] snic: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 43/51] stex: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 44/51] sun3_scsi: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 45/51] sym53c8xx: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 46/51] ufs: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 47/51] virtio_scsi: " Bart Van Assche
2021-05-24 9:23 ` Michael S. Tsirkin
2021-05-24 3:08 ` [PATCH v3 48/51] xen-scsifront: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 49/51] tcm_loop: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 50/51] usb-storage: " Bart Van Assche
2021-05-24 3:08 ` [PATCH v3 51/51] core: Remove the request member from struct scsi_cmnd 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=20210524030856.2824-33-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=hare@kernel.org \
--cc=hch@lst.de \
--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