public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
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>,
	"James E.J. Bottomley" <jejb@linux.ibm.com>,
	John Garry <john.garry@huawei.com>,
	Jason Yan <yanaijie@huawei.com>,
	Luo Jiaxing <luojiaxing@huawei.com>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	Jolly Shah <jollys@google.com>,
	Liu Shixin <liushixin2@huawei.com>
Subject: [PATCH v2 25/50] libsas: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
Date: Tue, 18 May 2021 10:44:25 -0700	[thread overview]
Message-ID: <20210518174450.20664-26-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/libsas/sas_ata.c       | 2 +-
 drivers/scsi/libsas/sas_scsi_host.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index e9a86128f1f1..d007a5714923 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -595,7 +595,7 @@ void sas_ata_task_abort(struct sas_task *task)
 
 	/* Bounce SCSI-initiated commands to the SCSI EH */
 	if (qc->scsicmd) {
-		blk_abort_request(qc->scsicmd->request);
+		blk_abort_request(scsi_cmd_to_rq(qc->scsicmd));
 		return;
 	}
 
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 1bf939818c98..b6cd9d87fbd0 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -908,7 +908,7 @@ void sas_task_abort(struct sas_task *task)
 	if (dev_is_sata(task->dev))
 		sas_ata_task_abort(task);
 	else
-		blk_abort_request(sc->request);
+		blk_abort_request(scsi_cmd_to_rq(sc));
 }
 
 void sas_target_destroy(struct scsi_target *starget)

  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 ` Bart Van Assche [this message]
2021-05-19 10:12   ` [PATCH v2 25/50] libsas: " 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 ` [PATCH v2 31/50] myrs: " Bart Van Assche
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-26-bvanassche@acm.org \
    --to=bvanassche@acm.org \
    --cc=gustavoars@kernel.org \
    --cc=jejb@linux.ibm.com \
    --cc=john.garry@huawei.com \
    --cc=jollys@google.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=liushixin2@huawei.com \
    --cc=luojiaxing@huawei.com \
    --cc=martin.petersen@oracle.com \
    --cc=yanaijie@huawei.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