From cc1d9059d5c34ec2f4b57d3c3eac2e9747acabf2 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shli@fusionio.com>
Date: Fri, 6 Apr 2012 11:37:47 -0600
Subject: [PATCH] --- yaml --- r: 299190 b: refs/heads/master c:
 1b2e19f17ed327af6add02978efdf354e4f8e4df h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/block/blk-core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 83979cffb3a6..c45dad495b1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 407ac95e2271a310016ced97f407676e79c53c06
+refs/heads/master: 1b2e19f17ed327af6add02978efdf354e4f8e4df
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index 414e8224588f..1f61b74867e4 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/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;