| Message ID | 1633002717-79765-1-git-send-email-john.garry@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | scsi: acornscsi: Remove scsi_cmd_to_tag() reference | expand |
On Thu, Sep 30, 2021 at 1:51 PM John Garry <john.garry@huawei.com> wrote: > > Commit 756fb6a895afb ("scsi: acornscsi: Remove tagged queuing vestiges") > mistakenly introduced a reference to function scsi_cmd_to_tag(). This > function does not exist as it was removed from an earlier series version > when I upstreamed the named commit - originally authored By Hannes - but > this reference still remained. > > Fix by replacing the reference to scsi_cmd_to_tag() with > scsi_cmd_to_rq(scsi_scmd)->tag, which scsi_cmd_to_tag() was a wrapper for. > > Fixes: 756fb6a895afb ("scsi: acornscsi: Remove tagged queuing vestiges") > Reported-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: John Garry <john.garry@huawei.com> Thanks, that fixes the build regression and looks sensible. Tested-by: Arnd Bergmann <arnd@arndb.de>
On Thu, 30 Sep 2021 19:51:57 +0800, John Garry wrote: > Commit 756fb6a895afb ("scsi: acornscsi: Remove tagged queuing vestiges") > mistakenly introduced a reference to function scsi_cmd_to_tag(). This > function does not exist as it was removed from an earlier series version > when I upstreamed the named commit - originally authored By Hannes - but > this reference still remained. > > Fix by replacing the reference to scsi_cmd_to_tag() with > scsi_cmd_to_rq(scsi_scmd)->tag, which scsi_cmd_to_tag() was a wrapper for. > > [...] Applied to 5.15/scsi-fixes, thanks! [1/1] scsi: acornscsi: Remove scsi_cmd_to_tag() reference https://git.kernel.org/mkp/scsi/c/c5336400ca8b
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index b4cb5fb19998..0cc62c1b0825 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c @@ -1776,7 +1776,7 @@ int acornscsi_reconnect_finish(AS_Host *host) host->scsi.disconnectable = 0; if (host->SCpnt->device->id == host->scsi.reconnected.target && host->SCpnt->device->lun == host->scsi.reconnected.lun && - scsi_cmd_to_tag(host->SCpnt) == host->scsi.reconnected.tag) { + scsi_cmd_to_rq(host->SCpnt)->tag == host->scsi.reconnected.tag) { #if (DEBUG & (DEBUG_QUEUES|DEBUG_DISCON)) DBG(host->SCpnt, printk("scsi%d.%c: reconnected", host->host->host_no, acornscsi_target(host)));
Commit 756fb6a895afb ("scsi: acornscsi: Remove tagged queuing vestiges") mistakenly introduced a reference to function scsi_cmd_to_tag(). This function does not exist as it was removed from an earlier series version when I upstreamed the named commit - originally authored By Hannes - but this reference still remained. Fix by replacing the reference to scsi_cmd_to_tag() with scsi_cmd_to_rq(scsi_scmd)->tag, which scsi_cmd_to_tag() was a wrapper for. Fixes: 756fb6a895afb ("scsi: acornscsi: Remove tagged queuing vestiges") Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: John Garry <john.garry@huawei.com>