scsi: ips: Do not try to abort command from host reset
authorHannes Reinecke <hare@suse.de>
Mon, 2 Oct 2023 15:43:22 +0000 (17:43 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 13 Oct 2023 18:23:15 +0000 (14:23 -0400)
The code for aborting an outstanding command is a copy of the functionality
from command abort. As we already have called this function once we reach
host reset there's no point in trying to do so again.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20231002154328.43718-13-hare@suse.de
Cc: Adaptec OEM Raid Solutions <aacraid@microsemi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ips.c

index bb206509265e9205ac87a81dbf1f602ccb9f1370..10cf5775a939110e206829c0622dd6c1788685fc 100644 (file)
@@ -835,7 +835,6 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)
        int i;
        ips_ha_t *ha;
        ips_scb_t *scb;
-       ips_copp_wait_item_t *item;
 
        METHOD_TRACE("ips_eh_reset", 1);
 
@@ -860,23 +859,6 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)
        if (!ha->active)
                return (FAILED);
 
-       /* See if the command is on the copp queue */
-       item = ha->copp_waitlist.head;
-       while ((item) && (item->scsi_cmd != SC))
-               item = item->next;
-
-       if (item) {
-               /* Found it */
-               ips_removeq_copp(&ha->copp_waitlist, item);
-               return (SUCCESS);
-       }
-
-       /* See if the command is on the wait queue */
-       if (ips_removeq_wait(&ha->scb_waitlist, SC)) {
-               /* command not sent yet */
-               return (SUCCESS);
-       }
-
        /* An explanation for the casual observer:                              */
        /* Part of the function of a RAID controller is automatic error         */
        /* detection and recovery.  As such, the only problem that physically   */