diff options
| author | Stefan Haberland <stefan.haberland@de.ibm.com> | 2008-01-26 14:11:26 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-01-26 14:11:30 +0100 |
| commit | 7dc1da9ffae5a344f7115d019e2be069d3e1bb8d (patch) | |
| tree | 26cdd74ba0bb65421346af5ee4e2db0ef4fd3a73 /drivers/s390/block | |
| parent | 028fed8233b669e03def295a4e632b1b933720f9 (diff) | |
| download | linux-7dc1da9ffae5a344f7115d019e2be069d3e1bb8d.tar.gz linux-7dc1da9ffae5a344f7115d019e2be069d3e1bb8d.tar.bz2 linux-7dc1da9ffae5a344f7115d019e2be069d3e1bb8d.zip | |
[S390] dasd: fix loop in request expiration handling
Add time to the 'expires' value to avoid a loop caused by the cqr
termination function
Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/block')
| -rw-r--r-- | drivers/s390/block/dasd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index db9193d38986..99268b964f67 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -1197,12 +1197,13 @@ static void __dasd_device_check_expire(struct dasd_device *device) (time_after_eq(jiffies, cqr->expires + cqr->starttime))) { if (device->discipline->term_IO(cqr) != 0) { /* Hmpf, try again in 5 sec */ - dasd_device_set_timer(device, 5*HZ); DEV_MESSAGE(KERN_ERR, device, "internal error - timeout (%is) expired " "for cqr %p, termination failed, " "retrying in 5s", (cqr->expires/HZ), cqr); + cqr->expires += 5*HZ; + dasd_device_set_timer(device, 5*HZ); } else { DEV_MESSAGE(KERN_ERR, device, "internal error - timeout (%is) expired " |