From: Jens Axboe Date: Thu, 21 Dec 2006 20:20:01 +0000 (+0100) Subject: [PATCH] elevator: fixup typo in merge logic X-Git-Tag: v2.6.20-rc2~65 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bb4067e34159648d394943d5e2a011f838bff22f;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Linus Torvalds --- diff --git a/block/elevator.c b/block/elevator.c index 62c7a3069d3..536be740ba4 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -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))