Skip to content

Commit c8102e4

Browse files
hreineckemartinkpetersen
authored andcommitted
scsi: ips: Do not try to abort command from host reset
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Cc: Adaptec OEM Raid Solutions <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Johannes Thumshirn <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 5bcd3bf commit c8102e4

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

drivers/scsi/ips.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,6 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)
835835
int i;
836836
ips_ha_t *ha;
837837
ips_scb_t *scb;
838-
ips_copp_wait_item_t *item;
839838

840839
METHOD_TRACE("ips_eh_reset", 1);
841840

@@ -860,23 +859,6 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)
860859
if (!ha->active)
861860
return (FAILED);
862861

863-
/* See if the command is on the copp queue */
864-
item = ha->copp_waitlist.head;
865-
while ((item) && (item->scsi_cmd != SC))
866-
item = item->next;
867-
868-
if (item) {
869-
/* Found it */
870-
ips_removeq_copp(&ha->copp_waitlist, item);
871-
return (SUCCESS);
872-
}
873-
874-
/* See if the command is on the wait queue */
875-
if (ips_removeq_wait(&ha->scb_waitlist, SC)) {
876-
/* command not sent yet */
877-
return (SUCCESS);
878-
}
879-
880862
/* An explanation for the casual observer: */
881863
/* Part of the function of a RAID controller is automatic error */
882864
/* detection and recovery. As such, the only problem that physically */

0 commit comments

Comments
 (0)