From ef26c24f9d6c8ec9b7f5b270e8c2c5928a6320d9 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Sat, 27 Aug 2011 11:31:28 -0700
Subject: [PATCH] --- yaml --- r: 268059 b: refs/heads/master c:
 2544b794372b63e46384ac4af91c5630e92cf7f4 h: refs/heads/master i:   268057:
 a54f491acf81eb324a91c146d0e9fd18b5820088   268055:
 3381ef53622368ac6ef18430009993d38b0bdd31 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/hv/storvsc_drv.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8d6c31a79027..885d4900fb47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8de73df1b5143c3d567e707e4dab0b20c82ab54
+refs/heads/master: 2544b794372b63e46384ac4af91c5630e92cf7f4
diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c
index ad0f9d4c5ba9..22a1d758620e 100644
--- a/trunk/drivers/staging/hv/storvsc_drv.c
+++ b/trunk/drivers/staging/hv/storvsc_drv.c
@@ -1154,7 +1154,15 @@ static void storvsc_command_completion(struct hv_storvsc_request *request)
 		}
 	}
 
-	scmnd->result = vm_srb->scsi_status;
+	/*
+	 * If there is an error; offline the device since all
+	 * error recovery strategies would have already been
+	 * deployed on the host side.
+	 */
+	if (vm_srb->srb_status == 0x4)
+		scmnd->result = DID_TARGET_FAILURE << 16;
+	else
+		scmnd->result = vm_srb->scsi_status;
 
 	if (scmnd->result) {
 		if (scsi_normalize_sense(scmnd->sense_buffer,