[patch 3/4] s390: device recognition.

[patch 3/4] s390: device recognition.

[Martin Schwidefsky]

From: Cornelia Huck <cohuck@de.ibm.com>

Close a small window where a device may be not operational again after
senseid finished and the "same device" check fails due to dev=0000 by
checking for dnv after stsch() by then setting the device to not
operational. (No need to check for dnv in ccw_device_handle_oper() again
since we don't do stsch() into the subchannel's schib in the meantime
and will get a crw anyway if the device becomes not oper again).

Signed-off-by: Cornelia Huck <cohuck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diffstat:
 drivers/s390/cio/device_fsm.c |    3 +++
 1 files changed, 3 insertions(+)

diff -urpN linux-2.6/drivers/s390/cio/device_fsm.c linux-2.6-patched/drivers/s390/cio/device_fsm.c
--- linux-2.6/drivers/s390/cio/device_fsm.c	2005-06-17 21:48:29.000000000 +0200
+++ linux-2.6-patched/drivers/s390/cio/device_fsm.c	2005-07-29 18:43:39.000000000 +0200
@@ -235,6 +235,9 @@ ccw_device_recog_done(struct ccw_device 
 		sch->schib.pmcw.pam &
 		sch->schib.pmcw.pom &
 		sch->opm;
+	/* Check since device may again have become not operational. */
+	if (!sch->schib.pmcw.dnv)
+		state = DEV_STATE_NOT_OPER;
 	if (cdev->private->state == DEV_STATE_DISCONNECTED_SENSE_ID)
 		/* Force reprobe on all chpids. */
 		old_lpm = 0;