UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390/dasd: Simplify code in format logic 

Currently, dasd_format is calling the format logic of a DASD discipline
with PAV enabled. If that fails with an error code of -EAGAIN the value
of retries is decremented and the discipline function is called with PAV
turned off.

The loop is supposed to try this up to 255 times until success. However,
-EAGAIN can only occur once here and therefore the loop will never reach
the 255 retries.

So, replace the unnecessarily complicated loop logic and simply try again
without PAV enabled in case of an -EAGAIN error.

Signed-off-by: Jan Höppner <hoeppner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Jan Höppner 2015-09-21 17:32:11 +02:00 committed by Martin Schwidefsky
parent 46d1c03c82
commit 8542885bf5
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/s390/block/dasd_ioctl.c
View File

@ -203,9 +203,7 @@ static int
dasd_format(struct dasd_block *block, struct format_data_t *fdata) dasd_format(struct dasd_block *block, struct format_data_t *fdata)
{ {
struct dasd_device *base; struct dasd_device *base;
int enable_pav = 1; int rc;
int rc, retries;
int start, stop;
base = block->base; base = block->base;
if (base->discipline->format_device == NULL) if (base->discipline->format_device == NULL)
@ -233,30 +231,11 @@ dasd_format(struct dasd_block *block, struct format_data_t *fdata)
bdput(bdev); bdput(bdev);
} }
retries = 255; rc = base->discipline->format_device(base, fdata, 1);
/* backup start- and endtrack for retries */ if (rc == -EAGAIN)
start = fdata->start_unit; rc = base->discipline->format_device(base, fdata, 0);
stop = fdata->stop_unit;
do {
rc = base->discipline->format_device(base, fdata, enable_pav);
if (rc) {
if (rc == -EAGAIN) {
retries--;
/* disable PAV in case of errors */
enable_pav = 0;
fdata->start_unit = start;
fdata->stop_unit = stop;
} else
return rc;
} else
/* success */
break;
} while (retries);
if (!retries) return rc;
return -EIO;
else
return 0;
} }
/* /*