shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-26 04:20:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: scsi: Retry unaligned zoned writes"

Browse Source 
Prepare for applying the FROMLIST version of this patch.

This reverts commit 33aea9741e.

Bug: 234829282
Change-Id: I4928e41be2dfcf25dd21ce5feb4e3dcdd8b9df35
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
Bart Van Assche
2023-08-04 09:52:46 -07:00
parent 2e83e40f6a
commit dc77af3d38
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/scsi_error.c
View File

@@ -671,12 +671,6 @@ enum scsi_disposition scsi_check_sense(struct scsi_cmnd *scmd)
fallthrough;
case ILLEGAL_REQUEST:
/*
* Unaligned write command. Retry immediately to handle
* out-of-order zoned writes.
*/
if (sshdr.asc == 0x21 && sshdr.ascq == 0x04)
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 */

3
drivers/scsi/sd.c
View File

@@ -1304,9 +1304,6 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd)
cmd->transfersize = sdp->sector_size;
cmd->underflow = nr_blocks << 9;
cmd->allowed = sdkp->max_retries;
if (blk_queue_pipeline_zoned_writes(rq->q) &&
blk_rq_is_seq_zoned_write(rq))
cmd->allowed += rq->q->nr_requests;
cmd->sdb.length = nr_blocks * sdp->sector_size;
SCSI_LOG_HLQUEUE(1,