diff options
| author | Hannes Reinecke <hare@suse.de> | 2013-01-30 09:26:18 +0000 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-07-01 17:31:25 +0200 |
| commit | 3d71ad32167c9124d5621b54c37a74ef38aa93b0 (patch) | |
| tree | f9f5eb8ff804adc07c72b337e0743580bbd4bdcc /drivers/s390/block/dasd.c | |
| parent | 80bd7181b036c7b4118eb19cfff3b555889596e6 (diff) | |
| download | linux-3d71ad32167c9124d5621b54c37a74ef38aa93b0.tar.bz2 | |
s390/dasd: Add 'timeout' attribute
This patch adds a 'timeout' attibute to the DASD driver.
When set to non-zero, the blk_timeout function will
be enabled with the timeout specified in the attribute.
Setting 'timeout' to '0' will disable block timeouts.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Stefan Weinhuber <wein@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/block/dasd.c')
| -rw-r--r-- | drivers/s390/block/dasd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index b97624bf183d..54f4bb8060c1 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -2894,6 +2894,8 @@ enum blk_eh_timer_return dasd_times_out(struct request *req) return BLK_EH_NOT_HANDLED; device = cqr->startdev ? cqr->startdev : block->base; + if (!device->blk_timeout) + return BLK_EH_RESET_TIMER; DBF_DEV_EVENT(DBF_WARNING, device, " dasd_times_out cqr %p status %x", cqr, cqr->status); |