From: Stefan Haberland <stefan.haberland@de.ibm.com>
Date: Fri, 26 Feb 2010 21:37:48 +0000 (+0100)
Subject: [S390] dasd: correct offline processing
X-Git-Tag: v2.6.34-rc1~268^2~8
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=b695adfaa118fd7c50eca8990e348dd7372ee0aa;p=net-next-2.6.git

[S390] dasd: correct offline processing

Flushing the dasd ccw request queue may stop the processing of the
block device request queue. Destroy partitions may wait for
outstanding requests and thus hang.
Swapping dasd_destroy_partitions and dasd_flush_request_queue so that
the request queue is empty before dasd_destroy_partitions is called.

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 302ca14a69e..9ab1ae40565 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -323,8 +323,8 @@ static int dasd_state_ready_to_basic(struct dasd_device *device)
 			device->state = DASD_STATE_READY;
 			return rc;
 		}
-		dasd_destroy_partitions(block);
 		dasd_flush_request_queue(block);
+		dasd_destroy_partitions(block);
 		block->blocks = 0;
 		block->bp_block = 0;
 		block->s2b_shift = 0;