s390/dasd: simplify locking in dasd_times_out
authorSebastian Ott <sebott@linux.ibm.com>
Wed, 16 May 2018 09:25:21 +0000 (11:25 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 25 May 2018 06:12:50 +0000 (08:12 +0200)
commit1bcdb5354aee2c0abcd13d912be35ae39a4144b6
tree80c2825c2bb008202e437261492229531f4848de
parenta166c368e7dbc84a5d8f013d9fda99f47f9c9f13
s390/dasd: simplify locking in dasd_times_out

Provide __dasd_cancel_req that is called with the ccw device lock
held to simplify the locking in dasd_times_out. Also this removes
the following sparse warning:
context imbalance in 'dasd_times_out' - different lock contexts for basic block

Note: with this change dasd_schedule_device_bh is now called (via
dasd_cancel_req) with the ccw device lock held. But is is already
the case for other codepaths.

Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/block/dasd.c