diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2006-12-21 21:20:01 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-21 22:01:04 -0800 |
| commit | bb4067e34159648d394943d5e2a011f838bff22f (patch) | |
| tree | a0b549c57fa72686b9d05e7ee3440fa5c70902d6 /block | |
| parent | 3e67c0987d7567ad666641164a153dca9a43b11d (diff) | |
| download | linux-3.10-bb4067e34159648d394943d5e2a011f838bff22f.tar.gz linux-3.10-bb4067e34159648d394943d5e2a011f838bff22f.tar.bz2 linux-3.10-bb4067e34159648d394943d5e2a011f838bff22f.zip | |
[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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/elevator.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |