s390 (3/6): dasd driver.
Subsystems (2)
PATCH 1/1 s390 (3/6): dasd driver.
[PATCH] s390: dasd driver.
From: Martin Schwidefsky <[email protected]>
dasd driver changes:
- Do error recovery for error recovery requests.
- Retry request if the start_IO failed because of a timeout.
diffstat:
drivers/s390/block/dasd.c | 21 +++++++++++---------- drivers/s390/block/dasd_eckd.c | 4 ++-- drivers/s390/block/dasd_erp.c | 5 +++-- 3 files changed, 16 insertions(+), 14 deletions(-)
drivers/s390/block/dasd.c +11 -10
@@ -7,7 +7,7 @@* Bugreports.to..: <[email protected]> * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001 * -* $Revision: 1.139 $ +* $Revision: 1.141 $ */ #include <linux/config.h>
@@ -751,16 +751,16 @@break ;case -EBUSY :DBF_DEV_EVENT (DBF_ERR , device,"%s" , -"device busy, retry later" ); +"start_IO: device busy, retry later" );break ;case -ETIMEDOUT :DBF_DEV_EVENT (DBF_ERR , device,"%s" , -"request timeout - terminated" ); +"start_IO: request timeout, retry later" ); +break ;case -ENODEV :case -EIO : - cqr->status =DASD_CQR_FAILED ; - cqr->stopclk = cqr->startclk; -dasd_schedule_bh (device); +DBF_DEV_EVENT (DBF_ERR , device,"%s" , +"start_IO: device gone, retry" );break ;default : DEV_MESSAGE(KERN_ERR, device,
@@ -1008,8 +1008,9 @@if (device->discipline->start_IO (next) ==0 ) expires = next->expires;else -MESSAGE (KERN_WARNING ,"%s" , -"Interrupt fastpath failed!" ); +DEV_MESSAGE (KERN_DEBUG , device,"%s" , +"Interrupt fastpath " +"failed!" ); } } }else {/* error */
@@ -1018,8 +1019,8 @@if (cqr->dstat)memcpy (cqr->dstat, irb,sizeof (struct irb ));else -MESSAGE (KERN_ERR ,"%s" , -"no memory for dstat...ignoring" ); +DEV_MESSAGE (KERN_ERR , device,"%s" , +"no memory for dstat...ignoring" );#ifdef ERP_DEBUG /* dump sense data */ dasd_log_sense (cqr, irb);
drivers/s390/block/dasd_eckd.c +2 -2
@@ -7,7 +7,7 @@* Bugreports.to..: <[email protected]> * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 * -* $Revision: 1.54 $ +* $Revision: 1.55 $ */ #include <linux/config.h>
@@ -1070,7 +1070,7 @@ cqr->device = device; cqr->expires =5 *60 *HZ ;/* 5 minutes */ cqr->lpm =LPM_ANYPATH ; - cqr->retries =2 ; + cqr->retries =256 ; cqr->buildclk =get_clock (); cqr->status =DASD_CQR_FILLED ;return cqr;
drivers/s390/block/dasd_erp.c +3 -2
@@ -7,7 +7,7 @@* Bugreports.to..: <[email protected]> * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001 * -* $Revision: 1.10 $ +* $Revision: 1.11 $ */ #include <linux/config.h>
@@ -67,7 +67,8 @@ }strncpy ((char *) &cqr->magic, magic,4 );ASCEBC ((char *) &cqr->magic,4 ); -atomic_inc (&device->ref_count); +set_bit (DASD_CQR_FLAGS_USE_ERP , &cqr->flags); +dasd_get_device (device);return cqr; }