[S390] dasd: prevent path verification before resume

Mark the device as suspended and delay execution of the path
verification worker to prevent mix-up.

Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index cb1bbc2947e3..cca25096efce 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1101,6 +1101,12 @@ static void do_path_verification_work(struct work_struct *work)
         data = container_of(work, struct path_verification_work_data, worker);
         device = data->device;
 
+        /* delay path verification until device was resumed */
+        if (test_bit(DASD_FLAG_SUSPENDED, &device->flags)) {
+                schedule_work(work);
+                return;
+        }
+
         opm = 0;
         npm = 0;
         ppm = 0;
@@ -2047,9 +2053,13 @@ static void dasd_eckd_check_for_device_change(struct dasd_device *device,
         /* first of all check for state change pending interrupt */
         mask = DEV_STAT_ATTENTION | DEV_STAT_DEV_END | DEV_STAT_UNIT_EXCEP;
         if ((scsw_dstat(&irb->scsw) & mask) == mask) {
-                /* for alias only and not in offline processing*/
+                /*
+                 * for alias only, not in offline processing
+                 * and only if not suspended
+                 */
                 if (!device->block && private->lcu &&
-                    !test_bit(DASD_FLAG_OFFLINE, &device->flags)) {
+                    !test_bit(DASD_FLAG_OFFLINE, &device->flags) &&
+                    !test_bit(DASD_FLAG_SUSPENDED, &device->flags)) {
                         /*
                          * the state change could be caused by an alias
                          * reassignment remove device from alias handling