diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-12-30 16:29:34 +0000 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-12-30 16:29:34 +0000 |
| commit | 6b1c374c45605504ed32e855c4e0f9b652a1978e (patch) | |
| tree | 2c1b90e6ef3c5fde1c871df110d7a3f8a2e3117d /drivers/scsi/scsi_error.c | |
| parent | 1b929c02afd37871d5afb9d498426f83432e71c2 (diff) | |
| parent | 1a5665fc8d7a000671ebd3fe69c6f9acf1e0dcd9 (diff) | |
| download | linux-6b1c374c45605504ed32e855c4e0f9b652a1978e.tar.bz2 | |
Merge branch '6.2/scsi-queue' into 6.2/scsi-fixes
Pull in remaining patches from the 6.2 queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/scsi_error.c')
| -rw-r--r-- | drivers/scsi/scsi_error.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index a7960ad2d386..2aa2c2aee6e7 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -231,6 +231,11 @@ scsi_abort_command(struct scsi_cmnd *scmd) struct Scsi_Host *shost = sdev->host; unsigned long flags; + if (!shost->hostt->eh_abort_handler) { + /* No abort handler, fail command directly */ + return FAILED; + } + if (scmd->eh_eflags & SCSI_EH_ABORT_SCHEDULED) { /* * Retry after abort failed, escalate to next level. |