Update to 3.4-final.

[linux-flexiantxendom0-3.2.10.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 414e822..1f61b74 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1277,7 +1277,8 @@ static bool attempt_plug_merge(struct request_queue *q, struct bio *bio,
        list_for_each_entry_reverse(rq, &plug->list, queuelist) {
                int el_ret;
 
-               (*request_count)++;
+               if (rq->q == q)
+                       (*request_count)++;
 
                if (rq->q != q || !blk_rq_merge_ok(rq, bio))
                        continue;