The patch titled
s390: fix I/O termination race in cio
has been added to the -mm tree. Its filename is
s390-fix-i-o-termination-race-in-cio.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Fix a race condition in the I/O termination logic. The race can cause I/O to
a dasd device to fail with no retry left after turning one channel path to the
device off and on multiple times.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/s390/cio/chsc.c | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff -puN drivers/s390/cio/chsc.c~s390-fix-i-o-termination-race-in-cio drivers/s390/cio/chsc.c
--- 25/drivers/s390/cio/chsc.c~s390-fix-i-o-termination-race-in-cio Mon Apr 24 16:45:49 2006
+++ 25-akpm/drivers/s390/cio/chsc.c Mon Apr 24 16:45:49 2006
@@ -242,28 +242,10 @@ s390_subchannel_remove_chpid(struct devi
if (sch->vpm == mask)
goto out_unreg;
- if ((sch->schib.scsw.actl & (SCSW_ACTL_CLEAR_PEND |
- SCSW_ACTL_HALT_PEND |
- SCSW_ACTL_START_PEND |
- SCSW_ACTL_RESUME_PEND)) &&
- (sch->schib.pmcw.lpum == mask)) {
- int cc = cio_cancel(sch);
-
- if (cc == -ENODEV)
- goto out_unreg;
-
- if (cc == -EINVAL) {
- cc = cio_clear(sch);
- if (cc == -ENODEV)
- goto out_unreg;
- /* Call handler. */
- if (sch->driver && sch->driver->termination)
- sch->driver->termination(&sch->dev);
- goto out_unlock;
- }
- } else if ((sch->schib.scsw.actl & SCSW_ACTL_DEVACT) &&
- (sch->schib.scsw.actl & SCSW_ACTL_SCHACT) &&
- (sch->schib.pmcw.lpum == mask)) {
+ if ((sch->schib.scsw.actl & SCSW_ACTL_DEVACT) &&
+ (sch->schib.scsw.actl & SCSW_ACTL_SCHACT) &&
+ (sch->schib.pmcw.lpum == mask) &&
+ (sch->vpm == 0)) {
int cc;
cc = cio_clear(sch);
_
Patches currently in -mm which might be from peter.oberparleiter@xxxxxxxxxx are
s390-fix-i-o-termination-race-in-cio.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
