2006-01-12 17:17:44

by Martin Schwidefsky

Subject: [patch 10/13] s390: fix blk_queue_ordered call in dasd.c.

From: Martin Schwidefsky <[email protected]>

[patch 10/13] s390: fix blk_queue_ordered call in dasd.c.

Add the missing third argument to the blk_queue_ordered call and
use the constant QUEUE_ORDERED_DRAIN instead of "1".

Signed-off-by: Martin Schwidefsky <[email protected]>

---

drivers/s390/block/dasd.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)

diff -urpN linux-2.6/drivers/s390/block/dasd.c linux-2.6-patched/drivers/s390/block/dasd.c
--- linux-2.6/drivers/s390/block/dasd.c 2006-01-12 15:43:26.000000000 +0100
+++ linux-2.6-patched/drivers/s390/block/dasd.c 2006-01-12 15:44:00.000000000 +0100
@@ -1635,7 +1635,7 @@ dasd_setup_queue(struct dasd_device * de
blk_queue_max_hw_segments(device->request_queue, -1L);
blk_queue_max_segment_size(device->request_queue, -1L);
blk_queue_segment_boundary(device->request_queue, -1L);
- blk_queue_ordered(device->request_queue, 1);
+ blk_queue_ordered(device->request_queue, QUEUE_ORDERED_DRAIN, NULL);
}

/*

2006-01-13 12:26:34

by Heiko Carstens

Subject: [PATCH] s390: fix blk_queue_ordered call in dasd.c fixup

From: Heiko Carstens <[email protected]>

The QUEUE_ORDERED_* numbers got renumbered and by accident the dasd driver
was changed to use QUEUE_ORDERED_DRAIN instead of QUEUE_ORDERED_TAG.

Signed-off-by: Heiko Carstens <[email protected]>
---

drivers/s390/block/dasd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff -urN a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
--- a/drivers/s390/block/dasd.c 2006-01-13 12:15:58.000000000 +0100
+++ b/drivers/s390/block/dasd.c 2006-01-13 12:25:42.000000000 +0100
@@ -1635,7 +1635,7 @@
blk_queue_max_hw_segments(device->request_queue, -1L);
blk_queue_max_segment_size(device->request_queue, -1L);
blk_queue_segment_boundary(device->request_queue, -1L);
- blk_queue_ordered(device->request_queue, QUEUE_ORDERED_DRAIN, NULL);
+ blk_queue_ordered(device->request_queue, QUEUE_ORDERED_TAG, NULL);
}

/*