diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2006-12-22 09:38:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-22 14:13:08 -0800 |
| commit | 719d34027e1a186e46a3952e8a24bf91ecc33837 (patch) | |
| tree | f0b9074069777c430045e7be803d8c5a2187ecc9 /net/netlabel/netlabel_cipso_v4.c | |
| parent | c2fda5fed81eea077363b285b66eafce20dfd45a (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>
Diffstat (limited to 'net/netlabel/netlabel_cipso_v4.c')
0 files changed, 0 insertions, 0 deletions