Skip to content

Commit

Permalink
s390/dasd: Fix error handling during online processing
Browse files Browse the repository at this point in the history
It is possible that the CCW commands for reading volume and extent pool
information are not supported, either by the storage server (for
dedicated DASDs) or by z/VM (for virtual devices, such as MDISKs).

As a command reject will occur in such a case, the current error
handling leads to a failing online processing and thus the DASD can't be
used at all.

Since the data being read is not essential for an fully operational
DASD, the error handling can be removed. Information about the failing
command is sent to the s390dbf debug feature.

Fixes: c729696 ("s390/dasd: Recognise data for ESE volumes")
Cc: <stable@vger.kernel.org> # 5.3
Reported-by: Frank Heimes <frank.heimes@canonical.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
Signed-off-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Jan Höppner authored and Jens Axboe committed Oct 1, 2019
1 parent bdf2007 commit dd45483
Showing 1 changed file with 8 additions and 16 deletions.
24 changes: 8 additions & 16 deletions drivers/s390/block/dasd_eckd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1553,8 +1553,8 @@ static int dasd_eckd_read_vol_info(struct dasd_device *device)
if (rc == 0) {
memcpy(&private->vsq, vsq, sizeof(*vsq));
} else {
dev_warn(&device->cdev->dev,
"Reading the volume storage information failed with rc=%d\n", rc);
DBF_EVENT_DEVID(DBF_WARNING, device->cdev,
"Reading the volume storage information failed with rc=%d", rc);
}

if (useglobal)
Expand Down Expand Up @@ -1737,8 +1737,8 @@ static int dasd_eckd_read_ext_pool_info(struct dasd_device *device)
if (rc == 0) {
dasd_eckd_cpy_ext_pool_data(device, lcq);
} else {
dev_warn(&device->cdev->dev,
"Reading the logical configuration failed with rc=%d\n", rc);
DBF_EVENT_DEVID(DBF_WARNING, device->cdev,
"Reading the logical configuration failed with rc=%d", rc);
}

dasd_sfree_request(cqr, cqr->memdev);
Expand Down Expand Up @@ -2020,14 +2020,10 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
dasd_eckd_read_features(device);

/* Read Volume Information */
rc = dasd_eckd_read_vol_info(device);
if (rc)
goto out_err3;
dasd_eckd_read_vol_info(device);

/* Read Extent Pool Information */
rc = dasd_eckd_read_ext_pool_info(device);
if (rc)
goto out_err3;
dasd_eckd_read_ext_pool_info(device);

/* Read Device Characteristics */
rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,
Expand Down Expand Up @@ -5663,14 +5659,10 @@ static int dasd_eckd_restore_device(struct dasd_device *device)
dasd_eckd_read_features(device);

/* Read Volume Information */
rc = dasd_eckd_read_vol_info(device);
if (rc)
goto out_err2;
dasd_eckd_read_vol_info(device);

/* Read Extent Pool Information */
rc = dasd_eckd_read_ext_pool_info(device);
if (rc)
goto out_err2;
dasd_eckd_read_ext_pool_info(device);

/* Read Device Characteristics */
rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,
Expand Down

0 comments on commit dd45483

Please sign in to comment.