aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2010-08-09 12:12:54 -0400
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2010-08-09 12:12:54 -0400
commitc304db8a860c10abfaf72f7faa3df598079e2f0c (patch)
tree55560afe240d82efedbd1badb422aeedf4118d4e /drivers/s390/cio
parent982bdf814616bec77c920e16ea4108d409f144ed (diff)
[S390] cio: use all available paths for some internal I/O
Use all available paths for the SENSE ID and STLCK commands. This prevents deadlocks in conjunction with reserved devices. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio')
-rw-r--r--drivers/s390/cio/device_id.c1
-rw-r--r--drivers/s390/cio/device_pgid.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index 0d7fe4dab3b6..78a0b43862c5 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -216,7 +216,6 @@ void ccw_device_sense_id_start(struct ccw_device *cdev)
216 req->timeout = SENSE_ID_TIMEOUT; 216 req->timeout = SENSE_ID_TIMEOUT;
217 req->maxretries = SENSE_ID_RETRIES; 217 req->maxretries = SENSE_ID_RETRIES;
218 req->lpm = sch->schib.pmcw.pam & sch->opm; 218 req->lpm = sch->schib.pmcw.pam & sch->opm;
219 req->singlepath = 1;
220 req->check = snsid_check; 219 req->check = snsid_check;
221 req->callback = snsid_callback; 220 req->callback = snsid_callback;
222 ccw_request_start(cdev); 221 ccw_request_start(cdev);
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index f1fdf0ec7f03..82a5ad0d63f6 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -563,7 +563,6 @@ void ccw_device_stlck_start(struct ccw_device *cdev, void *data, void *buf1,
563 req->timeout = PGID_TIMEOUT; 563 req->timeout = PGID_TIMEOUT;
564 req->maxretries = PGID_RETRIES; 564 req->maxretries = PGID_RETRIES;
565 req->lpm = sch->schib.pmcw.pam & sch->opm; 565 req->lpm = sch->schib.pmcw.pam & sch->opm;
566 req->singlepath = 1;
567 req->data = data; 566 req->data = data;
568 req->callback = stlck_callback; 567 req->callback = stlck_callback;
569 stlck_build_cp(cdev, buf1, buf2); 568 stlck_build_cp(cdev, buf1, buf2);