diff options
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 4f5aec708be6..66d31687cf6b 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
| @@ -1347,7 +1347,7 @@ static bool bio_attempt_back_merge(struct request_queue *q, struct request *req, | |||
| 1347 | if (!ll_back_merge_fn(q, req, bio)) | 1347 | if (!ll_back_merge_fn(q, req, bio)) |
| 1348 | return false; | 1348 | return false; |
| 1349 | 1349 | ||
| 1350 | trace_block_bio_backmerge(q, bio); | 1350 | trace_block_bio_backmerge(q, req, bio); |
| 1351 | 1351 | ||
| 1352 | if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff) | 1352 | if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff) |
| 1353 | blk_rq_set_mixed_merge(req); | 1353 | blk_rq_set_mixed_merge(req); |
| @@ -1369,7 +1369,7 @@ static bool bio_attempt_front_merge(struct request_queue *q, | |||
| 1369 | if (!ll_front_merge_fn(q, req, bio)) | 1369 | if (!ll_front_merge_fn(q, req, bio)) |
| 1370 | return false; | 1370 | return false; |
| 1371 | 1371 | ||
| 1372 | trace_block_bio_frontmerge(q, bio); | 1372 | trace_block_bio_frontmerge(q, req, bio); |
| 1373 | 1373 | ||
| 1374 | if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff) | 1374 | if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff) |
| 1375 | blk_rq_set_mixed_merge(req); | 1375 | blk_rq_set_mixed_merge(req); |