]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[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)
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

index 62c7a3069d3a20981067e1865c77be04a3990847..536be740ba4e6443f4ecb3501b4d45631385e4e6 100644 (file)
@@ -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))