1 files changed, 29 insertions, 7 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 1aec8ff0b587..f73d2f579a7e 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1863,6 +1863,33 @@ static void __dasd_device_check_expire(struct dasd_device *device)
 }
 
 /*
+ * return 1 when device is not eligible for IO
+ */
+static int __dasd_device_is_unusable(struct dasd_device *device,
+                                     struct dasd_ccw_req *cqr)
+{
+        int mask = ~(DASD_STOPPED_DC_WAIT | DASD_UNRESUMED_PM);
+
+        if (test_bit(DASD_FLAG_OFFLINE, &device->flags)) {
+                /* dasd is being set offline. */
+                return 1;
+        }
+        if (device->stopped) {
+                if (device->stopped & mask) {
+                        /* stopped and CQR will not change that. */
+                        return 1;
+                }
+                if (!test_bit(DASD_CQR_VERIFY_PATH, &cqr->flags)) {
+                        /* CQR is not able to change device to
+                         * operational. */
+                        return 1;
+                }
+                /* CQR required to get device operational. */
+        }
+        return 0;
+}
+
+/*
  * Take a look at the first request on the ccw queue and check
  * if it needs to be started.
  */
@@ -1876,13 +1903,8 @@ static void __dasd_device_start_head(struct dasd_device *device)
         cqr = list_entry(device->ccw_queue.next, struct dasd_ccw_req, devlist);
         if (cqr->status != DASD_CQR_QUEUED)
                 return;
-        /* when device is stopped, return request to previous layer
-         * exception: only the disconnect or unresumed bits are set and the
-         * cqr is a path verification request
-         */
-        if (device->stopped &&
-            !(!(device->stopped & ~(DASD_STOPPED_DC_WAIT | DASD_UNRESUMED_PM))
-              && test_bit(DASD_CQR_VERIFY_PATH, &cqr->flags))) {
+        /* if device is not usable return request to upper layer */
+        if (__dasd_device_is_unusable(device, cqr)) {
                 cqr->intrc = -EAGAIN;
                 cqr->status = DASD_CQR_CLEARED;
                 dasd_schedule_device_bh(device);