From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 22 Dec 2006 08:38:53 +0000 (+0100)
Subject: [PATCH] cfq-iosched: tighten allow merge criteria
X-Git-Tag: v2.6.20-rc2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=719d34027e1a186e46a3952e8a24bf91ecc33837;p=pandora-kernel.git

[PATCH] cfq-iosched: tighten allow merge criteria

The logic in cfq_allow_merge() wasn't clear enough - basically allow
merging for the same queues only.  Do a fast check for 'rq and bio both
sync/async' before doing the cfqq hash lookup.

This is verified to work with the fixed elv_try_merge() from commit
bb4067e34159648d394943d5e2a011f838bff22f.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

Reading git-diff-tree failed