From aa4a1810850dfe966ccfb896abd78341fb055661 Mon Sep 17 00:00:00 2001 From: Stefan Haberland Date: Sat, 26 Jan 2008 14:11:26 +0100 Subject: [PATCH] --- yaml --- r: 77221 b: refs/heads/master c: 7dc1da9ffae5a344f7115d019e2be069d3e1bb8d h: refs/heads/master i: 77219: 22f3db23e2d8941e30021c402ff5561a3cdba8c9 v: v3 --- [refs] | 2 +- trunk/drivers/s390/block/dasd.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9bb07b8ad48a..9e38543e6c04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 028fed8233b669e03def295a4e632b1b933720f9 +refs/heads/master: 7dc1da9ffae5a344f7115d019e2be069d3e1bb8d diff --git a/trunk/drivers/s390/block/dasd.c b/trunk/drivers/s390/block/dasd.c index db9193d38986..99268b964f67 100644 --- a/trunk/drivers/s390/block/dasd.c +++ b/trunk/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 "