From: Stefan Haberland <sth@linux.ibm.com>

Date: Fri, 5 Mar 2021 13:54:38 +0100

Subject: s390/dasd: fix hanging DASD driver unbind

Git-commit: 7d365bd0bff3c0310c39ebaffc9a8458e036d666

Patch-mainline: v5.12-rc3

References: bsc#1183932 LTC#192153

In case of an unbind of the DASD device driver the function

dasd_generic_remove() is called which shuts down the device.

Among others this functions removes the int_handler from the cdev.

During shutdown the device cancels all outstanding IO requests and waits

for completion of the clear request.

Unfortunately the clear interrupt will never be received when there is no

interrupt handler connected.

Fix by moving the int_handler removal after the call to the state machine

where no request or interrupt is outstanding.

Cc: stable@vger.kernel.org

Signed-off-by: Stefan Haberland <sth@linux.ibm.com>

Tested-by: Bjoern Walk <bwalk@linux.ibm.com>

Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Acked-by: Petr Tesarik <ptesarik@suse.com>

---

 drivers/s390/block/dasd.c |    3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/drivers/s390/block/dasd.c

+++ b/drivers/s390/block/dasd.c

@@ -3522,8 +3522,6 @@ void dasd_generic_remove(struct ccw_devi

 	struct dasd_device *device;

 	struct dasd_block *block;

-	cdev->handler = NULL;

-

 	device = dasd_device_from_cdev(cdev);

 	if (IS_ERR(device)) {

 		dasd_remove_sysfs_files(cdev);

@@ -3542,6 +3540,7 @@ void dasd_generic_remove(struct ccw_devi

 	 * no quite down yet.

 	 */

 	dasd_set_target_state(device, DASD_STATE_NEW);

+	cdev->handler = NULL;

 	/* dasd_delete_device destroys the device reference. */

 	block = device->block;

 	dasd_delete_device(device);