Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7768b33 authored by Stefan Haberland's avatar Stefan Haberland Committed by Greg Kroah-Hartman
Browse files

s390/dasd: use correct number of retries for ERP requests 



[ Upstream commit acea28a6b74f458defda7417d2217b051ba7d444 ]

If a DASD request fails an error recovery procedure (ERP) request might
be built as a copy of the original request to do error recovery.

The ERP request gets a number of retries assigned.
This number is always 256 no matter what other value might have been set
for the original request. This is not what is expected when a user
specifies a certain amount of retries for the device via sysfs.

Correctly use the number of retries of the original request for ERP
requests.

Signed-off-by: default avatarStefan Haberland <sth@linux.ibm.com>
Reviewed-by: default avatarJan Hoeppner <hoeppner@linux.ibm.com>
Link: https://lore.kernel.org/r/20230721193647.3889634-3-sth@linux.ibm.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a21ff228

drivers/s390/block/dasd_3990_erp.c

+1 −1
Original line number Diff line number Diff line
@@ -2436,7 +2436,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr) 
	erp->block    = cqr->block;

	erp->magic    = cqr->magic;

	erp->expires  = cqr->expires;

	erp->retries  = 256;

	erp->retries  = device->default_retries;

	erp->buildclk = get_tod_clock();

	erp->status = DASD_CQR_FILLED;