]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c2fda5f) | patch
[PATCH] cfq-iosched: tighten allow merge criteria
authorJens Axboe <jens.axboe@oracle.com>
Fri, 22 Dec 2006 08:38:53 +0000 (09:38 +0100)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 22 Dec 2006 22:13:08 +0000 (14:13 -0800)
commit719d34027e1a186e46a3952e8a24bf91ecc33837
treef0b9074069777c430045e7be803d8c5a2187ecc9tree | snapshot
parentc2fda5fed81eea077363b285b66eafce20dfd45acommit | diff
[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>
block/cfq-iosched.c diff | blob | history
Linux 2.6 source tree