Skip to content

Commit d0b9025

Browse files
hreineckemartinkpetersen
authored andcommitted
scsi: core: scsi_error: Do not queue pointless abort workqueue functions
If a host template doesn't implement the .eh_abort_handler() there is no point in queueing the abort workqueue function; all it does is invoking SCSI EH anyway. So return 'FAILED' from scsi_abort_command() if the .eh_abort_handler() is not implemented and save us from having to wait for the abort workqueue function to complete. Cc: Niklas Cassel <niklas.cassel@wdc.com> Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com> Cc: John Garry <john.g.garry@oracle.com> Signed-off-by: Hannes Reinecke <hare@suse.de> [niklas: moved the check to the top of scsi_abort_command()] Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com> Link: https://lore.kernel.org/r/20221206131346.2045375-1-niklas.cassel@wdc.com Reviewed-by: John Garry <john.g.garry@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 67ff3d0 commit d0b9025

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

drivers/scsi/scsi_error.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,11 @@ scsi_abort_command(struct scsi_cmnd *scmd)
231231
struct Scsi_Host *shost = sdev->host;
232232
unsigned long flags;
233233

234+
if (!shost->hostt->eh_abort_handler) {
235+
/* No abort handler, fail command directly */
236+
return FAILED;
237+
}
238+
234239
if (scmd->eh_eflags & SCSI_EH_ABORT_SCHEDULED) {
235240
/*
236241
* Retry after abort failed, escalate to next level.

0 commit comments

Comments
 (0)