---

yaml --- r: 299190 b: refs/heads/master c: 1b2e19f h: refs/heads/master v: v3
git-mirror · Apr 6, 2012 · cc1d905 · cc1d905
1 parent 1de4dbc
commit cc1d905
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;