aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-01-19 11:27:47 +1100
committerJens Axboe <axboe@carl.home.kernel.dk>2007-02-11 23:14:44 +0100
commit783660b2f60418144e168ab75a06786f9695fc70 (patch)
treec25135f978bb2b400852b8aa27458a6d1649e999
parentcad9751642b62cbb5f62feedc546b4f7890497d4 (diff)
downloadmrst-s0i3-test-783660b2f60418144e168ab75a06786f9695fc70.tar.gz
mrst-s0i3-test-783660b2f60418144e168ab75a06786f9695fc70.tar.xz
mrst-s0i3-test-783660b2f60418144e168ab75a06786f9695fc70.zip
elevator: don't sort reads between writes
Don't allow elv_dispatch_sort() to mix reads and writes together, it's rarely a good idea. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--block/elevator.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/block/elevator.c b/block/elevator.c
index d0376239914..25f6ef28e3b 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -413,6 +413,8 @@ void elv_dispatch_sort(request_queue_t *q, struct request *rq)
list_for_each_prev(entry, &q->queue_head) {
struct request *pos = list_entry_rq(entry);
+ if (rq_data_dir(rq) != rq_data_dir(pos))
+ break;
if (pos->cmd_flags & (REQ_SOFTBARRIER|REQ_HARDBARRIER|REQ_STARTED))
break;
if (rq->sector >= boundary) {