Revert "ANDROID: scsi: core: Delay unaligned write error retries"

Prepare for applying the FROMLIST version of this patch.

This reverts commit 2dffc600ca.

Bug: 234829282
Change-Id: I58fad37a8586350676b6d9be93aa01b1ce170a00
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
Bart Van Assche
2023-08-04 09:50:46 -07:00
parent 053f022ed4
commit a0565250b3
2 changed files with 3 additions and 4 deletions

View File

@@ -672,11 +672,11 @@ enum scsi_disposition scsi_check_sense(struct scsi_cmnd *scmd)
case ILLEGAL_REQUEST:
/*
* Unaligned write command. This indicates that zoned writes got
* reordered. Retry after all pending commands have completed.
* Unaligned write command. Retry immediately to handle
* out-of-order zoned writes.
*/
if (sshdr.asc == 0x21 && sshdr.ascq == 0x04)
return NEEDS_DELAYED_RETRY;
return NEEDS_RETRY;
if (sshdr.asc == 0x20 || /* Invalid command operation code */
sshdr.asc == 0x21 || /* Logical block address out of range */
sshdr.asc == 0x22 || /* Invalid function */

View File

@@ -93,7 +93,6 @@ static inline int scsi_status_is_check_condition(int status)
* Internal return values.
*/
enum scsi_disposition {
NEEDS_DELAYED_RETRY = 0x2000,
NEEDS_RETRY = 0x2001,
SUCCESS = 0x2002,
FAILED = 0x2003,