---

yaml --- r: 161057 b: refs/heads/master c: 5f91bb0 h: refs/heads/master i: 161055: 85a394c v: v3
git-mirror · Aug 22, 2009 · ba69d09 · ba69d09
1 parent 58b22f6
commit ba69d09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;
 	}