summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Weinhuber <wein@de.ibm.com>2008-03-05 12:37:10 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-03-05 12:37:18 +0100
commit5c12f2406cea24a2c885a8d3e5aa7ab94c65f0d5 (patch)
tree7a0a7bf17975bc809a0d950ddb606be84749a86e
parent98c7b388afffdc5699095261b437b286d718270c (diff)
downloadkernel-crypto-5c12f2406cea24a2c885a8d3e5aa7ab94c65f0d5.tar.gz
kernel-crypto-5c12f2406cea24a2c885a8d3e5aa7ab94c65f0d5.tar.xz
kernel-crypto-5c12f2406cea24a2c885a8d3e5aa7ab94c65f0d5.zip
[S390] dasd: let dasd erp matching recognize alias recovery
When a request fails that was started on an alias device then the first recovery step is to retry it on the base device. If the recovery request fails again with the same symptoms, the next step should not be a simple retry, but should be a proper recovery based on sense data, etc. To do so, the dasd recovery functions need to recognize the alias recovery step in the erp chain by comparing the start devices. Signed-off-by: Stefan Weinhuber <wein@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--drivers/s390/block/dasd_3990_erp.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index f69714a0e9e..b19db20a0be 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -2310,10 +2310,8 @@ static int
dasd_3990_erp_error_match(struct dasd_ccw_req *cqr1, struct dasd_ccw_req *cqr2)
{
- /* check failed CCW */
- if (cqr1->irb.scsw.cpa != cqr2->irb.scsw.cpa) {
- // return 0; /* CCW doesn't match */
- }
+ if (cqr1->startdev != cqr2->startdev)
+ return 0;
if (cqr1->irb.esw.esw0.erw.cons != cqr2->irb.esw.esw0.erw.cons)
return 0;