| commit | bb4067e34159648d394943d5e2a011f838bff22f | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jens.axboe@oracle.com> | Thu Dec 21 21:20:01 2006 +0100 |
| committer | Linus Torvalds <torvalds@woody.osdl.org> | Thu Dec 21 22:01:04 2006 -0800 |
| tree | a0b549c57fa72686b9d05e7ee3440fa5c70902d6 | |
| parent | 3e67c0987d7567ad666641164a153dca9a43b11d [diff] |
[PATCH] elevator: fixup typo in merge logic The recent io scheduler allow_merge commit left the block layer with no merging, oops. This patch fixes that up. That means the CFQ change needs to be verified again, it might not fix the original bug now. But that's a seperate thing, I'll double check that tomorrow. Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>