]> git.baikalelectronics.ru Git - kernel.git/commit
[PATCH] elevator: fixup typo in merge logic
authorJens Axboe <jens.axboe@oracle.com>
Thu, 21 Dec 2006 20:20:01 +0000 (21:20 +0100)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 22 Dec 2006 06:01:04 +0000 (22:01 -0800)
commit1ee6a3c1393b24173caf5f96e87d29f6bfdfae09
treea0b549c57fa72686b9d05e7ee3440fa5c70902d6
parent78ef3dfc9002f76e566eb9d5663d66967b327771
[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>
block/elevator.c