From: Stefan Haberland <stefan.haberland@de.ibm.com>
Date: Wed, 5 Jan 2011 11:48:07 +0000 (+0100)
Subject: [S390] dasd: Correct retry counter for terminated I/O.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=09a8e7adcf960bd6a7204f3f3b377a89ce22efbf;p=linux-beck.git

[S390] dasd: Correct retry counter for terminated I/O.

In case the DASD driver needs to term a running I/O the retry counter
is decreased twice.
Remove the unnecessary retry counter decrease in das_term_IO.

Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 4e266f43332d..794bfd962266 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -855,7 +855,6 @@ int dasd_term_IO(struct dasd_ccw_req *cqr)
 		rc = ccw_device_clear(device->cdev, (long) cqr);
 		switch (rc) {
 		case 0:	/* termination successful */
-			cqr->retries--;
 			cqr->status = DASD_CQR_CLEAR_PENDING;
 			cqr->stopclk = get_clock();
 			cqr->starttime = 0;