From ff05b990b825d5ea17a8873d69745e3fb0a83ebc Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Mon, 13 Feb 2012 15:38:22 -0500
Subject: [PATCH] --- yaml --- r: 292972 b: refs/heads/master c:
 66a651aa7a48b7c6181aff556937454c87bb9feb h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/scsi_lib.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b5d4e75532f5..a8aa5f17d434 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c834b1c4ec8ccc9c2d814bd78264b509708fe6dd
+refs/heads/master: 66a651aa7a48b7c6181aff556937454c87bb9feb
diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c
index 5b770e9e82c2..b4833deffd3b 100644
--- a/trunk/drivers/scsi/scsi_lib.c
+++ b/trunk/drivers/scsi/scsi_lib.c
@@ -880,6 +880,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
 				    cmd->cmnd[0] == WRITE_SAME)) {
 				description = "Discard failure";
 				action = ACTION_FAIL;
+				error = -EREMOTEIO;
 			} else
 				action = ACTION_FAIL;
 			break;