diff options
Diffstat (limited to 'block/blk-merge.c')
-rw-r--r-- | block/blk-merge.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 7c9ca01baa45..b0de8574fdc8 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c | |||
@@ -380,12 +380,6 @@ static int attempt_merge(struct request_queue *q, struct request *req, | |||
380 | if (blk_integrity_rq(req) != blk_integrity_rq(next)) | 380 | if (blk_integrity_rq(req) != blk_integrity_rq(next)) |
381 | return 0; | 381 | return 0; |
382 | 382 | ||
383 | /* don't merge requests of different failfast settings */ | ||
384 | if (blk_failfast_dev(req) != blk_failfast_dev(next) || | ||
385 | blk_failfast_transport(req) != blk_failfast_transport(next) || | ||
386 | blk_failfast_driver(req) != blk_failfast_driver(next)) | ||
387 | return 0; | ||
388 | |||
389 | /* | 383 | /* |
390 | * If we are allowed to merge, then append bio list | 384 | * If we are allowed to merge, then append bio list |
391 | * from next to rq and release next. merge_requests_fn | 385 | * from next to rq and release next. merge_requests_fn |