diff options
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index cbbc36ba016a..924b81b08f86 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
| @@ -67,8 +67,7 @@ inline int elv_rq_merge_ok(struct request *rq, struct bio *bio) | |||
| 67 | /* | 67 | /* |
| 68 | * same device and no special stuff set, merge is ok | 68 | * same device and no special stuff set, merge is ok |
| 69 | */ | 69 | */ |
| 70 | if (rq->rq_disk == bio->bi_bdev->bd_disk && | 70 | if (rq->rq_disk == bio->bi_bdev->bd_disk && !rq->special) |
| 71 | !rq->waiting && !rq->special) | ||
| 72 | return 1; | 71 | return 1; |
| 73 | 72 | ||
| 74 | return 0; | 73 | return 0; |