From: Christoph Hellwig <hch@lst.de>
Date: Mon, 27 Oct 2014 15:28:13 +0000 (+0100)
Subject: scsi: return EAGAIN when resetting a device under EH
X-Git-Tag: v3.19-rc1~176^2~1^2~26
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9afccc5245a35468f52bc3f53ed162caabf275d;p=karo-tx-linux.git

scsi: return EAGAIN when resetting a device under EH

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 712f159ebb69..c4f7b56fa6f6 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -278,7 +278,7 @@ int scsi_ioctl_block_when_processing_errors(struct scsi_device *sdev, int cmd,
 {
 	if (cmd == SG_SCSI_RESET && ndelay) {
 		if (scsi_host_in_recovery(sdev->host))
-			return -ENODEV;
+			return -EAGAIN;
 	} else {
 		if (!scsi_block_when_processing_errors(sdev))
 			return -ENODEV;