patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / block / elevator.c

diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c
index c42fd0d..4ce5ca1 100644 (file)
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
@@ -169,6 +169,13 @@ void elv_requeue_request(request_queue_t *q, struct request *rq)
 void __elv_add_request(request_queue_t *q, struct request *rq, int where,
                       int plug)
 {
+       /*
+        * barriers implicitly indicate back insertion
+        */
+       if (rq->flags & (REQ_SOFTBARRIER | REQ_HARDBARRIER) &&
+           where == ELEVATOR_INSERT_SORT)
+               where = ELEVATOR_INSERT_BACK;
+
        if (plug)
                blk_plug_device(q);