From e3136f54947c7bd14a106dc4cea0d7355d93c682 Mon Sep 17 00:00:00 2001 From: Stefan Haberland Date: Sun, 30 Oct 2011 15:16:56 +0100 Subject: [PATCH] --- yaml --- r: 272075 b: refs/heads/master c: 214b8ffc205bcf2ca5b04b3903be13a9257c3fbd h: refs/heads/master i: 272073: e601a6e1680891df1b513fc7620fa2a85b660117 272071: 8a3ef2a0c5598ebbbfb73b716e2425936e6851e6 v: v3 --- [refs] | 2 +- trunk/drivers/s390/block/dasd.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9a4adb080a37..65e7b6a01474 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3948a102509f3bc3cc8728b2556a1ad7a4dbd7e7 +refs/heads/master: 214b8ffc205bcf2ca5b04b3903be13a9257c3fbd diff --git a/trunk/drivers/s390/block/dasd.c b/trunk/drivers/s390/block/dasd.c index 46054c75cf31..3b94b6542fc0 100644 --- a/trunk/drivers/s390/block/dasd.c +++ b/trunk/drivers/s390/block/dasd.c @@ -2261,7 +2261,11 @@ int dasd_sleep_on_immediatly(struct dasd_ccw_req *cqr) cqr->callback = dasd_wakeup_cb; cqr->callback_data = DASD_SLEEPON_START_TAG; cqr->status = DASD_CQR_QUEUED; - list_add(&cqr->devlist, &device->ccw_queue); + /* + * add new request as second + * first the terminated cqr needs to be finished + */ + list_add(&cqr->devlist, device->ccw_queue.next); /* let the bh start the request to keep them in order */ dasd_schedule_device_bh(device);