From 7edb7353749bed2b52c4a76ff6e0a52dc2d590aa Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Thu, 19 Feb 2009 21:48:54 +0000
Subject: [PATCH] --- yaml --- r: 131912 b: refs/heads/master c:
 126c098296c8f96cf7f6ca0fdb47265ac7994f00 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/scsi_lib.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 616c176f54b9..3fa60b3d6a94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4034cc68157bfa0b6622efe368488d3d3e20f4e6
+refs/heads/master: 126c098296c8f96cf7f6ca0fdb47265ac7994f00
diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c
index 940dc32ff0dc..b82ffd90632e 100644
--- a/trunk/drivers/scsi/scsi_lib.c
+++ b/trunk/drivers/scsi/scsi_lib.c
@@ -1040,12 +1040,11 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
 				action = ACTION_FAIL;
 			break;
 		case ABORTED_COMMAND:
+			action = ACTION_FAIL;
 			if (sshdr.asc == 0x10) { /* DIF */
 				description = "Target Data Integrity Failure";
-				action = ACTION_FAIL;
 				error = -EILSEQ;
-			} else
-				action = ACTION_RETRY;
+			}
 			break;
 		case NOT_READY:
 			/* If the device is in the process of becoming