From ba69d096c91ccb57832ecb3cdb8f06a690e7caf5 Mon Sep 17 00:00:00 2001
From: Michael Reed <mdr@sgi.com>
Date: Mon, 10 Aug 2009 11:59:28 -0500
Subject: [PATCH] --- yaml --- r: 161057 b: refs/heads/master c:
 5f91bb050ecc4ff1d8d3d07edbe550c8f431c5e1 h: refs/heads/master i:   161055:
 85a394ccc90c347a34b94b5d62a873f33b94f75b v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/scsi/scsi_error.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 19b7be80daf5..ce04ae821b97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edced191e4512b7795380563634f4d44b21c684a
+refs/heads/master: 5f91bb050ecc4ff1d8d3d07edbe550c8f431c5e1
diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c
index a1689353d7fd..877204daf549 100644
--- a/trunk/drivers/scsi/scsi_error.c
+++ b/trunk/drivers/scsi/scsi_error.c
@@ -382,9 +382,13 @@ static int scsi_eh_completed_normally(struct scsi_cmnd *scmd)
 		 * who knows?  FIXME(eric)
 		 */
 		return SUCCESS;
+	case RESERVATION_CONFLICT:
+		/*
+		 * let issuer deal with this, it could be just fine
+		 */
+		return SUCCESS;
 	case BUSY:
 	case QUEUE_FULL:
-	case RESERVATION_CONFLICT:
 	default:
 		return FAILED;
 	}