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>,
Adaptec OEM Raid Solutions <aacraid@microsemi.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>
Subject: [PATCH v4 13/52] aacraid: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
Date: Thu, 5 Aug 2021 12:17:49 -0700 [thread overview]
Message-ID: <20210805191828.3559897-14-bvanassche@acm.org> (raw)
In-Reply-To: <20210805191828.3559897-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/aacraid/aachba.c | 2 +-
drivers/scsi/aacraid/commsup.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 267934d2f14b..c2d6f0a9e0b1 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1504,7 +1504,7 @@ static struct aac_srb * aac_scsi_common(struct fib * fib, struct scsi_cmnd * cmd
srbcmd->id = cpu_to_le32(scmd_id(cmd));
srbcmd->lun = cpu_to_le32(cmd->device->lun);
srbcmd->flags = cpu_to_le32(flag);
- timeout = cmd->request->timeout/HZ;
+ timeout = scsi_cmd_to_rq(cmd)->timeout / HZ;
if (timeout == 0)
timeout = (dev->sa_firmware ? AAC_SA_TIMEOUT : AAC_ARC_TIMEOUT);
srbcmd->timeout = cpu_to_le32(timeout); // timeout in seconds
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 54eb4d41bc2c..deb32c9f4b3e 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -224,7 +224,7 @@ struct fib *aac_fib_alloc_tag(struct aac_dev *dev, struct scsi_cmnd *scmd)
{
struct fib *fibptr;
- fibptr = &dev->fibs[scmd->request->tag];
+ fibptr = &dev->fibs[scsi_cmd_to_rq(scmd)->tag];
/*
* Null out fields that depend on being zero at the start of
* each I/O
next prev parent reply other threads:[~2021-08-05 19:19 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-05 19:17 [PATCH v4 00/52] Remove the request pointer from struct scsi_cmnd Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 01/52] core: Introduce the scsi_cmd_to_rq() function Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 02/52] core: Use scsi_cmd_to_rq() instead of scsi_cmnd.request Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 03/52] sd: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 04/52] sr: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 05/52] scsi_transport_fc: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 06/52] scsi_transport_spi: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 07/52] ata: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 08/52] RDMA/iser: " Bart Van Assche
2021-08-06 19:32 ` Sagi Grimberg
2021-08-05 19:17 ` [PATCH v4 09/52] RDMA/srp: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 10/52] zfcp: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 11/52] 53c700: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 12/52] NCR5380: " Bart Van Assche
2021-08-06 9:24 ` Finn Thain
2021-08-06 15:56 ` Bart Van Assche
2021-08-06 20:24 ` Michael Schmitz
2021-08-07 18:09 ` Bart Van Assche
2021-08-08 1:01 ` Finn Thain
2021-08-05 19:17 ` Bart Van Assche [this message]
2021-08-05 19:17 ` [PATCH v4 14/52] advansys: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 15/52] aha1542: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 16/52] bnx2i: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 17/52] csiostor: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 18/52] cxlflash: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 19/52] dpt_i2o: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 20/52] fnic: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 21/52] hisi_sas: " Bart Van Assche
2021-08-05 19:17 ` [PATCH v4 22/52] hpsa: " Bart Van Assche
2021-08-05 22:08 ` Don.Brace
2021-08-05 19:17 ` [PATCH v4 23/52] ibmvfc: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 24/52] ibmvscsi: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 25/52] ips: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 26/52] libsas: " Bart Van Assche
2021-08-06 8:14 ` John Garry
2021-08-05 19:18 ` [PATCH v4 27/52] lpfc: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 28/52] megaraid: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 29/52] mpi3mr: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 30/52] mpt3sas: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 31/52] mvumi: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 32/52] myrb: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 33/52] myrs: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 34/52] ncr53c8xx: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 35/52] qedf: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 36/52] qedi: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 37/52] qla1280: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 38/52] qla2xxx: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 39/52] qla4xxx: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 40/52] qlogicpti: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 41/52] scsi_debug: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 42/52] smartpqi: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 43/52] snic: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 44/52] stex: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 45/52] sun3_scsi: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 46/52] sym53c8xx: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 47/52] ufs: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 48/52] virtio_scsi: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 49/52] xen-scsifront: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 50/52] tcm_loop: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 51/52] usb-storage: " Bart Van Assche
2021-08-05 19:18 ` [PATCH v4 52/52] core: Remove the request member from struct scsi_cmnd Bart Van Assche
[not found] ` <CGME20210805192017epcas2p486b21e2f00e29f9254892884bb340c40@epcms2p1>
2021-08-05 21:39 ` [PATCH v4 47/52] ufs: Use scsi_cmd_to_rq() instead of scsi_cmnd.request Daejun Park
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=20210805191828.3559897-14-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=aacraid@microsemi.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.