aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/elevator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 62c7a3069d3a..536be740ba4e 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)
82 /* 82 /*
83 * must be same device and not a special request 83 * must be same device and not a special request
84 */ 84 */
85 if (rq->rq_disk != bio->bi_bdev->bd_disk || !rq->special) 85 if (rq->rq_disk != bio->bi_bdev->bd_disk || rq->special)
86 return 0; 86 return 0;
87 87
88 if (!elv_iosched_allow_merge(rq, bio)) 88 if (!elv_iosched_allow_merge(rq, bio))