[SCSI] reservation conflict after timeout causes device to be taken offline

[deliverable/linux.git] / drivers / scsi / scsi_error.c

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a1689353d7fd715cf91776e9b290381795876477..877204daf549644338fb2b55494944af7127a8ea 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/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;
        }