diff options
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 4b1b29ef2cb0..e9a5ae25db8c 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
| @@ -1202,6 +1202,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) | |||
| 1202 | if (!blk_rq_cpu_valid(req)) | 1202 | if (!blk_rq_cpu_valid(req)) |
| 1203 | req->cpu = bio->bi_comp_cpu; | 1203 | req->cpu = bio->bi_comp_cpu; |
| 1204 | drive_stat_acct(req, 0); | 1204 | drive_stat_acct(req, 0); |
| 1205 | elv_bio_merged(q, req, bio); | ||
| 1205 | if (!attempt_back_merge(q, req)) | 1206 | if (!attempt_back_merge(q, req)) |
| 1206 | elv_merged_request(q, req, el_ret); | 1207 | elv_merged_request(q, req, el_ret); |
| 1207 | goto out; | 1208 | goto out; |
| @@ -1235,6 +1236,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) | |||
| 1235 | if (!blk_rq_cpu_valid(req)) | 1236 | if (!blk_rq_cpu_valid(req)) |
| 1236 | req->cpu = bio->bi_comp_cpu; | 1237 | req->cpu = bio->bi_comp_cpu; |
| 1237 | drive_stat_acct(req, 0); | 1238 | drive_stat_acct(req, 0); |
| 1239 | elv_bio_merged(q, req, bio); | ||
| 1238 | if (!attempt_front_merge(q, req)) | 1240 | if (!attempt_front_merge(q, req)) |
| 1239 | elv_merged_request(q, req, el_ret); | 1241 | elv_merged_request(q, req, el_ret); |
| 1240 | goto out; | 1242 | goto out; |