diff --git a/[refs] b/[refs] index 5b1221f190fe..17118cdf1c69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cad9751642b62cbb5f62feedc546b4f7890497d4 +refs/heads/master: 783660b2f60418144e168ab75a06786f9695fc70 diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c index d03762399147..25f6ef28e3bb 100644 --- a/trunk/block/elevator.c +++ b/trunk/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) {