Skip to content

Commit 7a7aecd

Browse files
committed
Merge tag 'ata-6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux
Pull ata fix from Niklas Cassel: - Fix the handling of ATA commands that timeout (command that did not receive a completion interrupt within the configured timeout time). Commands that timeout, while also having either the FAILFAST flag set, or the command being a passthrough command, should never be retried. Restore this behavior (as it was before v6.12-rc1). * tag 'ata-6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux: ata: libata: Set DID_TIME_OUT for commands that actually timed out
2 parents 01154cc + 8e59a2a commit 7a7aecd

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/ata/libata-eh.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,7 @@ void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap,
651651
/* the scmd has an associated qc */
652652
if (!(qc->flags & ATA_QCFLAG_EH)) {
653653
/* which hasn't failed yet, timeout */
654+
set_host_byte(scmd, DID_TIME_OUT);
654655
qc->err_mask |= AC_ERR_TIMEOUT;
655656
qc->flags |= ATA_QCFLAG_EH;
656657
nr_timedout++;

0 commit comments

Comments
 (0)