diff options
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 651136aae76e..5efc9e7a68b7 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c | |||
| @@ -441,6 +441,9 @@ static int attempt_merge(struct request_queue *q, struct request *req, | |||
| 441 | || next->special) | 441 | || next->special) |
| 442 | return 0; | 442 | return 0; |
| 443 | 443 | ||
| 444 | if (blk_integrity_rq(req) != blk_integrity_rq(next)) | ||
| 445 | return 0; | ||
| 446 | |||
| 444 | /* | 447 | /* |
| 445 | * If we are allowed to merge, then append bio list | 448 | * If we are allowed to merge, then append bio list |
| 446 | * from next to rq and release next. merge_requests_fn | 449 | * from next to rq and release next. merge_requests_fn |