From: John Garry <john.garry@huawei.com>
To: <satishkh@cisco.com>, <sebaddel@cisco.com>, <kartilak@cisco.com>,
<jejb@linux.ibm.com>, <martin.petersen@oracle.com>
Cc: <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<hare@suse.de>, <hch@lst.de>, <bvanassche@acm.org>,
John Garry <john.garry@huawei.com>
Subject: [PATCH 1/3] scsi: wd719: Stop using scsi_cmnd.tag
Date: Fri, 13 Aug 2021 21:49:11 +0800 [thread overview]
Message-ID: <1628862553-179450-2-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1628862553-179450-1-git-send-email-john.garry@huawei.com>
Use scsi_cmd_to_rq(cmd)->tag instead.
Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/scsi/wd719x.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/wd719x.c b/drivers/scsi/wd719x.c
index edc8a139a60d..622aec075aba 100644
--- a/drivers/scsi/wd719x.c
+++ b/drivers/scsi/wd719x.c
@@ -466,14 +466,16 @@ static int wd719x_abort(struct scsi_cmnd *cmd)
unsigned long flags;
struct wd719x_scb *scb = scsi_cmd_priv(cmd);
struct wd719x *wd = shost_priv(cmd->device->host);
+ struct device *dev = &wd->pdev->dev;
- dev_info(&wd->pdev->dev, "abort command, tag: %x\n", cmd->tag);
+ dev_info(dev, "abort command, tag: %x\n", scsi_cmd_to_rq(cmd)->tag);
- action = /*cmd->tag ? WD719X_CMD_ABORT_TAG : */WD719X_CMD_ABORT;
+ action = /*tag ? WD719X_CMD_ABORT_TAG : */WD719X_CMD_ABORT;
spin_lock_irqsave(wd->sh->host_lock, flags);
result = wd719x_direct_cmd(wd, action, cmd->device->id,
- cmd->device->lun, cmd->tag, scb->phys, 0);
+ cmd->device->lun, scsi_cmd_to_rq(cmd)->tag,
+ scb->phys, 0);
wd719x_finish_cmd(scb, DID_ABORT);
spin_unlock_irqrestore(wd->sh->host_lock, flags);
if (result)
--
2.26.2
next prev parent reply other threads:[~2021-08-13 13:54 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 13:49 [PATCH 0/3] Remove scsi_cmnd.tag John Garry
2021-08-13 13:49 ` John Garry [this message]
2021-08-13 16:30 ` [PATCH 1/3] scsi: wd719: Stop using scsi_cmnd.tag Hannes Reinecke
2021-08-14 3:11 ` Bart Van Assche
2021-08-13 13:49 ` [PATCH 2/3] scsi: fnic: Stop setting scsi_cmnd.tag John Garry
2021-08-13 16:31 ` Hannes Reinecke
2021-08-14 3:17 ` Bart Van Assche
2021-08-14 7:39 ` Christoph Hellwig
2021-08-14 12:35 ` Hannes Reinecke
2021-08-16 10:00 ` John Garry
2021-08-16 11:11 ` Hannes Reinecke
2021-08-13 13:49 ` [PATCH 3/3] scsi: Remove scsi_cmnd.tag John Garry
2021-08-13 16:31 ` Hannes Reinecke
2021-08-14 3:18 ` Bart Van Assche
2021-08-14 7:40 ` [PATCH 0/3] " Christoph Hellwig
2021-08-16 17:34 ` Martin K. Petersen
2021-08-18 18:08 ` John Garry
2021-08-18 18:46 ` Martin K. Petersen
2021-08-19 2:41 ` Bart Van Assche
2021-08-19 7:15 ` Hannes Reinecke
2021-08-19 7:27 ` John Garry
2021-08-19 7:50 ` Hannes Reinecke
2021-08-19 9:09 ` John Garry
2021-08-24 4:03 ` Martin K. Petersen
2021-08-24 7:54 ` John Garry
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=1628862553-179450-2-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=bvanassche@acm.org \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=kartilak@cisco.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=satishkh@cisco.com \
--cc=sebaddel@cisco.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
all inboxes | Powered by JetHome®