diff options
| author | Stefan Haberland <sth@linux.vnet.ibm.com> | 2016-08-08 14:08:17 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-31 19:31:59 -0400 |
| commit | c68f2d5722f7d77a28b2c26545e753a50eabebfd (patch) | |
| tree | 9aa9f4e6b5ab55cc2b2be6ac8fd31ebc9069e0f0 | |
| parent | 64a45a08814a6b1c2ce563b60cd5896fdbbb596c (diff) | |
| download | linux-stable-c68f2d5722f7d77a28b2c26545e753a50eabebfd.tar.gz linux-stable-c68f2d5722f7d77a28b2c26545e753a50eabebfd.tar.bz2 linux-stable-c68f2d5722f7d77a28b2c26545e753a50eabebfd.zip | |
s390/dasd: fix hanging device after clear subchannel
[ Upstream commit 9ba333dc55cbb9523553df973adb3024d223e905 ]
When a device is in a status where CIO has killed all I/O by itself the
interrupt for a clear request may not contain an irb to determine the
clear function. Instead it contains an error pointer -EIO.
This was ignored by the DASD int_handler leading to a hanging device
waiting for a clear interrupt.
Handle -EIO error pointer correctly for requests that are clear pending and
treat the clear as successful.
Signed-off-by: Stefan Haberland <sth@linux.vnet.ibm.com>
Reviewed-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | drivers/s390/block/dasd.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 329db997ee66..35672b081254 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -1621,9 +1621,18 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, unsigned long long now; int expires; + cqr = (struct dasd_ccw_req *) intparm; if (IS_ERR(irb)) { switch (PTR_ERR(irb)) { case -EIO: + if (cqr && cqr->status == DASD_CQR_CLEAR_PENDING) { + device = (struct dasd_device *) cqr->startdev; + cqr->status = DASD_CQR_CLEARED; + dasd_device_clear_timer(device); + wake_up(&dasd_flush_wq); + dasd_schedule_device_bh(device); + return; + } break; case -ETIMEDOUT: DBF_EVENT_DEVID(DBF_WARNING, cdev, "%s: " @@ -1639,7 +1648,6 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, } now = get_tod_clock(); - cqr = (struct dasd_ccw_req *) intparm; /* check for conditions that should be handled immediately */ if (!cqr || !(scsw_dstat(&irb->scsw) == (DEV_STAT_CHN_END | DEV_STAT_DEV_END) && |