[41/50] snic: Use blk_req() instead of scsi_cmnd.request

Message ID	20210514213356.5264-42-bvanassche@acm.org
State	Superseded
Headers	show Return-Path: <linux-scsi-owner@kernel.org> 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>, Karan Tilak Kumar <kartilak@cisco.com>, Sesidhar Baddela <sebaddel@cisco.com>, "James E.J. Bottomley" <jejb@linux.ibm.com> Subject: [PATCH 41/50] snic: Use blk_req() instead of scsi_cmnd.request Date: Fri, 14 May 2021 14:32:56 -0700 Message-Id: <20210514213356.5264-42-bvanassche@acm.org> In-Reply-To: <20210514213356.5264-1-bvanassche@acm.org> References: <20210514213356.5264-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/50] core: Introduce the blk_req() function \| expand [01/50] core: Introduce the blk_req() function [03/50] sd: Use blk_req() instead of scsi_cmnd.request [09/50] rdma/srp: Use blk_req() instead of scsi_cmnd.request [11/50] 53c700: Use blk_req() instead of scsi_cmnd.request [13/50] aacraid: Use blk_req() instead of scsi_cmnd.request [15/50] bnx2i: Use blk_req() instead of scsi_cmnd.request [17/50] cxlflash: Use blk_req() instead of scsi_cmnd.request [19/50] fnic: Use blk_req() instead of scsi_cmnd.request [21/50] hpsa: Use blk_req() instead of scsi_cmnd.request [25/50] libsas: Use blk_req() instead of scsi_cmnd.request [27/50] megaraid: Use blk_req() instead of scsi_cmnd.request [29/50] mvumi: Use blk_req() instead of scsi_cmnd.request [31/50] myrs: Use blk_req() instead of scsi_cmnd.request [33/50] qedf: Use blk_req() instead of scsi_cmnd.request [35/50] qla1280: Use blk_req() instead of scsi_cmnd.request [37/50] qla4xxx: Use blk_req() instead of scsi_cmnd.request [39/50] scsi_debug: Use blk_req() instead of scsi_cmnd.request [41/50] snic: Use blk_req() instead of scsi_cmnd.request [43/50] sun3_scsi: Use blk_req() instead of scsi_cmnd.request [45/50] ufs: Use blk_req() instead of scsi_cmnd.request [46/50] virtio_scsi: Use blk_req() instead of scsi_cmnd.request [48/50] tcm_loop: Use blk_req() instead of scsi_cmnd.request [50/50] core: Remove the request member from struct scsi_cmnd [02/50] core: Use blk_req() instead of scsi_cmnd.request [04/50] sr: Use blk_req() instead of scsi_cmnd.request [07/50] ata: Use blk_req() instead of scsi_cmnd.request [08/50] rdma/iser: Use blk_req() instead of scsi_cmnd.request [10/50] zfcp: Use blk_req() instead of scsi_cmnd.request [12/50] NCR5380: Use blk_req() instead of scsi_cmnd.request [14/50] advansys: Use blk_req() instead of scsi_cmnd.request [16/50] csiostor: Use blk_req() instead of scsi_cmnd.request [18/50] dpt_i2o: Use blk_req() instead of scsi_cmnd.request [20/50] hisi_sas: Use blk_req() instead of scsi_cmnd.request [22/50] ibmvfc: Use blk_req() instead of scsi_cmnd.request [24/50] ips: Use blk_req() instead of scsi_cmnd.request

Message ID

20210514213356.5264-42-bvanassche@acm.org

State

Superseded

Headers

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>,
	Karan Tilak Kumar <kartilak@cisco.com>,
	Sesidhar Baddela <sebaddel@cisco.com>,
	"James E.J. Bottomley" <jejb@linux.ibm.com>
Subject: [PATCH 41/50] snic: Use blk_req() instead of scsi_cmnd.request
Date: Fri, 14 May 2021 14:32:56 -0700
Message-Id: <20210514213356.5264-42-bvanassche@acm.org>
In-Reply-To: <20210514213356.5264-1-bvanassche@acm.org>
References: <20210514213356.5264-1-bvanassche@acm.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[01/50] core: Introduce the blk_req() function | expand

Commit Message

Bart Van Assche May 14, 2021, 9:32 p.m. UTC

Prepare for removal of the request pointer by using blk_req() instead. This
patch does not change any functionality.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/scsi/snic/snic_scsi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c
index 6dd0ff188bb4..72175072351a 100644
--- a/drivers/scsi/snic/snic_scsi.c
+++ b/drivers/scsi/snic/snic_scsi.c
@@ -33,7 +33,7 @@ 
 #include "snic_io.h"
 #include "snic.h"
 
-#define snic_cmd_tag(sc)	(((struct scsi_cmnd *) sc)->request->tag)
+#define snic_cmd_tag(sc)	(blk_req(sc)->tag)
 
 const char *snic_state_str[] = {
 	[SNIC_INIT]	= "SNIC_INIT",
@@ -1636,7 +1636,7 @@  snic_abort_cmd(struct scsi_cmnd *sc)
 	u32 start_time = jiffies;
 
 	SNIC_SCSI_DBG(snic->shost, "abt_cmd:sc %p :0x%x :req = %p :tag = %d\n",
-		       sc, sc->cmnd[0], sc->request, tag);
+		       sc, sc->cmnd[0], blk_req(sc), tag);
 
 	if (unlikely(snic_get_state(snic) != SNIC_ONLINE)) {
 		SNIC_HOST_ERR(snic->shost,
@@ -2152,7 +2152,7 @@  snic_device_reset(struct scsi_cmnd *sc)
 	int dr_supp = 0;
 
 	SNIC_SCSI_DBG(shost, "dev_reset:sc %p :0x%x :req = %p :tag = %d\n",
-		      sc, sc->cmnd[0], sc->request,
+		      sc, sc->cmnd[0], blk_req(sc),
 		      snic_cmd_tag(sc));
 	dr_supp = snic_dev_reset_supported(sc->device);
 	if (!dr_supp) {
@@ -2387,7 +2387,7 @@  snic_host_reset(struct scsi_cmnd *sc)
 
 	SNIC_SCSI_DBG(shost,
 		      "host reset:sc %p sc_cmd 0x%x req %p tag %d flags 0x%llx\n",
-		      sc, sc->cmnd[0], sc->request,
+		      sc, sc->cmnd[0], blk_req(sc),
 		      snic_cmd_tag(sc), CMD_FLAGS(sc));
 
 	ret = snic_reset(shost, sc);
@@ -2494,7 +2494,7 @@  snic_scsi_cleanup(struct snic *snic, int ex_tag)
 		sc->result = DID_TRANSPORT_DISRUPTED << 16;
 		SNIC_HOST_INFO(snic->shost,
 			       "sc_clean: DID_TRANSPORT_DISRUPTED for sc %p, Tag %d flags 0x%llx rqi %p duration %u msecs\n",
-			       sc, sc->request->tag, CMD_FLAGS(sc), rqi,
+			       sc, blk_req(sc)->tag, CMD_FLAGS(sc), rqi,
 			       jiffies_to_msecs(jiffies - st_time));
 
 		/* Update IO stats */

[41/50] snic: Use blk_req() instead of scsi_cmnd.request

Commit Message

Patch