[patch 1/5] qdio: prevent double qdio shutdown in case of I/O errors

[Martin Schwidefsky <schwidefsky@de.ibm.com>]

[-- Attachment #1: 001-qdio-shutdown.diff --]
[-- Type: text/plain, Size: 1017 bytes --]

From: Jan Glauber <jang@linux.vnet.ibm.com>

In case of I/O errors on a qdio subchannel qdio_shutdown may be 
called twice by the qdio driver and by zfcp. Remove the 
superfluous shutdown from qdio and let the upper layer driver
handle the error condition.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

 drivers/s390/cio/qdio_main.c |    1 -
 1 file changed, 1 deletion(-)

Index: quilt-2.6/drivers/s390/cio/qdio_main.c
===================================================================
--- quilt-2.6.orig/drivers/s390/cio/qdio_main.c
+++ quilt-2.6/drivers/s390/cio/qdio_main.c
@@ -1083,7 +1083,6 @@ void qdio_int_handler(struct ccw_device 
 		case -EIO:
 			sprintf(dbf_text, "ierr%4x", irq_ptr->schid.sch_no);
 			QDIO_DBF_TEXT2(1, setup, dbf_text);
-			qdio_int_error(cdev);
 			return;
 		case -ETIMEDOUT:
 			sprintf(dbf_text, "qtoh%4x", irq_ptr->schid.sch_no);

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.