s390/dasd: make number of retries configurable

[karo-tx-linux.git] / drivers / s390 / block / dasd_diag.c

diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index cc06033585226d04a7e52cf5b1f1ca9fbc6e9a29..154842242c3d01158c7934dd91c3ae47e1a93577 100644 (file)
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -359,6 +359,7 @@ dasd_diag_check_device(struct dasd_device *device)
        }
 
        device->default_expires = DIAG_TIMEOUT;
+       device->default_retries = DIAG_MAX_RETRIES;
 
        /* Figure out position of label block */
        switch (private->rdc_data.vdev_class) {
@@ -555,7 +556,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,
                        recid++;
                }
        }
-       cqr->retries = DIAG_MAX_RETRIES;
+       cqr->retries = memdev->default_retries;
        cqr->buildclk = get_tod_clock();
        if (blk_noretry_request(req) ||
            block->base->features & DASD_FEATURE_FAILFAST)