Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df3044f1 authored by Stefan Haberland's avatar Stefan Haberland Committed by Martin Schwidefsky
Browse files

s390/dasd: Fix unresumed device after suspend/resume having no paths 



The DASD device driver prevents I/O from being started on stopped
devices. This also prevented channel paths to be verified and so
the device was unable to be resumed.
Fix by allowing path verification requests on stopped devices.

Signed-off-by: default avatarStefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent a3147a7b

drivers/s390/block/dasd.c

+16 −12
Original line number Diff line number Diff line
@@ -2166,7 +2166,11 @@ static int _dasd_sleep_on(struct dasd_ccw_req *maincqr, int interruptible) 
			cqr->intrc = -ENOLINK;

			continue;

		}

		/* Don't try to start requests if device is stopped */

		/*

		 * Don't try to start requests if device is stopped

		 * except path verification requests

		 */

		if (!test_bit(DASD_CQR_VERIFY_PATH, &cqr->flags)) {

			if (interruptible) {

				rc = wait_event_interruptible(

					generic_waitq, !(device->stopped));
@@ -2177,7 +2181,7 @@ static int _dasd_sleep_on(struct dasd_ccw_req *maincqr, int interruptible) 
				}

			} else

				wait_event(generic_waitq, !(device->stopped));



		}

		if (!cqr->callback)

			cqr->callback = dasd_wakeup_cb;