Commit a1fc8181 authored Feb 19, 2018 by Stefan Haberland Committed by Martin Schwidefsky Feb 27, 2018

s390/dasd: remove unneeded sanity check



Reported by smatch that the usage of cqr->block is inconsistent.
The sanity check is not needed because _dasd_requeue_request already
checks for a valid cqr->block pointer and all referenced ERP requests
have a valid cqr->block pointer as well since it is copied during ERP
process.

Signed-off-by: Stefan Haberland <sth@linux.vnet.ibm.com>
Reviewed-by: Jan Hoeppner <hoeppner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent 5e725c57

drivers/s390/block/dasd.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -3918,7 +3918,12 @@ static int dasd_generic_requeue_all_requests(struct dasd_device *device)
		cqr = refers;
		}

		if (cqr->block)
		/*
		* _dasd_requeue_request already checked for a valid
		* blockdevice, no need to check again
		* all erp requests (cqr->refers) have a cqr->block
		* pointer copy from the original cqr
		*/
		list_del_init(&cqr->blocklist);
		cqr->block->base->discipline->free_cp(
		cqr, (struct request *) cqr->callback_data);