Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9765621 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: sd_zbc: Let the SCSI core handle ILLEGAL REQUEST / ASC 0x21 



scsi_io_completion() translates the sense key ILLEGAL REQUEST / ASC 0x21 into
ACTION_FAIL. That means that setting cmd->allowed to zero in sd_zbc_complete()
for this sense code / ASC combination is not necessary. Hence remove the code
that resets cmd->allowed from sd_zbc_complete().

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Damien Le Moal <damien.lemoal@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 354f1132

drivers/scsi/sd_zbc.c

+0 −10
Original line number Diff line number Diff line
@@ -299,16 +299,6 @@ void sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes, 
	case REQ_OP_WRITE:

	case REQ_OP_WRITE_ZEROES:

	case REQ_OP_WRITE_SAME:



		if (result &&

		    sshdr->sense_key == ILLEGAL_REQUEST &&

		    sshdr->asc == 0x21)

			/*

			 * INVALID ADDRESS FOR WRITE error: It is unlikely that

			 * retrying write requests failed with any kind of

			 * alignement error will result in success. So don't.

			 */

			cmd->allowed = 0;

		break;



	case REQ_OP_ZONE_REPORT: