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

Commit aade6c0d authored by Stefan Haberland's avatar Stefan Haberland Committed by Martin Schwidefsky
Browse files

[S390] dasd: prevent IO error during reserve/release loop 



The termination of running CQR caused by reserve/release operations
may lead to an IO error if reserve/release is done in a tight loop.
Prevent this by increasing the retry counter after termination.

Signed-off-by: default avatarStefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent fdb1bb15

drivers/s390/block/dasd.c

+10 −1
Original line number Diff line number Diff line
@@ -1742,11 +1742,20 @@ int dasd_sleep_on_interruptible(struct dasd_ccw_req *cqr) 
static inline int _dasd_term_running_cqr(struct dasd_device *device)

{

	struct dasd_ccw_req *cqr;

	int rc;



	if (list_empty(&device->ccw_queue))

		return 0;

	cqr = list_entry(device->ccw_queue.next, struct dasd_ccw_req, devlist);

	return device->discipline->term_IO(cqr);

	rc = device->discipline->term_IO(cqr);

	if (!rc)

		/*

		 * CQR terminated because a more important request is pending.

		 * Undo decreasing of retry counter because this is

		 * not an error case.

		 */

		cqr->retries++;

	return rc;

}



int dasd_sleep_on_immediatly(struct dasd_ccw_req *cqr)