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

Commit 3e695f89 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by James Bottomley
Browse files

[SCSI] Fix error handling for DIF/DIX 



patch

commit b60af5b0
Author: Alan Stern <stern@rowland.harvard.edu>
Date:   Mon Nov 3 15:56:47 2008 -0500

    [SCSI] simplify scsi_io_completion()

broke DIX error handling.  Also, we are now using EILSEQ to indicate
integrity errors to the upper layers (as opposed to regular EIO
failures).  This allows filesystems to inspect buffers and decide
whether to retry the I/O.  Update scsi_io_completion() accordingly.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 4f5299ac

drivers/scsi/scsi_lib.c

+8 −1
Original line number Diff line number Diff line
@@ -980,6 +980,8 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) 
		return;

	this_count = blk_rq_bytes(req);



	error = -EIO;



	if (host_byte(result) == DID_RESET) {

		/* Third party bus reset or reset for error recovery

		 * reasons.  Just retry the command and see what
@@ -1021,13 +1023,18 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) 
				/* This will issue a new 6-byte command. */

				cmd->device->use_10_for_rw = 0;

				action = ACTION_REPREP;

			} else if (sshdr.asc == 0x10) /* DIX */ {

				description = "Host Data Integrity Failure";

				action = ACTION_FAIL;

				error = -EILSEQ;

			} else

				action = ACTION_FAIL;

			break;

		case ABORTED_COMMAND:

			if (sshdr.asc == 0x10) { /* DIF */

				description = "Target Data Integrity Failure";

				action = ACTION_FAIL;

				description = "Data Integrity Failure";

				error = -EILSEQ;

			} else

				action = ACTION_RETRY;

			break;