Commit bb4067e3 authored Dec 21, 2006 by Jens Axboe Committed by Linus Torvalds Dec 21, 2006

[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>

parent 3e67c098

block/elevator.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ inline int elv_rq_merge_ok(struct request rq, struct bio bio)
		/*
		* must be same device and not a special request
		*/
		if (rq->rq_disk != bio->bi_bdev->bd_disk \|\| !rq->special)
		if (rq->rq_disk != bio->bi_bdev->bd_disk \|\| rq->special)
		return 0;

		if (!elv_iosched_allow_merge(rq, bio))