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

Commit ad630826 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] fix propogation of integrity errors 

When the Integrity check is done in scsi_io_completion it will
set error to -EILSEQ. However, at this point error is no longer
used, and blk_end_request_err has -EIO hardcoded.

It looks like there was just porting mistake with this patch
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=3e695f89c5debb735e4ff051e9e58d8fb4e95110


and we meant to send error upwards, so this patch changes the hard
coded EIO to the error variable.

I have only boot tested this patch.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent cce9c8ae

drivers/scsi/scsi_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) 
				scsi_print_sense("", cmd);

			scsi_print_command(cmd);

		}

		if (blk_end_request_err(req, -EIO))

		if (blk_end_request_err(req, error))

			scsi_requeue_command(q, cmd);

		else

			scsi_next_command(cmd);