diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-03-13 10:18:37 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-03-13 10:18:37 -0400 |
| commit | 1a04a74ddd2f2bdcc54014f487a95d77fb407566 (patch) | |
| tree | fdc1bcddda6b838eb0d09f18f6a038a9eef0d0c6 /block | |
| parent | 19daa85eed725312d87ff42872c50b56fc8f9b9d (diff) | |
| parent | dd4534d88b93a911983503851ec9441787a4997d (diff) | |
Merge tag 'v4.4.52' into v4.4-rt
This is the 4.4.52 stable release
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 2e21e4c049e2..de4a35cb92d4 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1279,12 +1279,9 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) blk_queue_split(q, &bio, q->bio_split); - if (!is_flush_fua && !blk_queue_nomerges(q)) { - if (blk_attempt_plug_merge(q, bio, &request_count, - &same_queue_rq)) - return BLK_QC_T_NONE; - } else - request_count = blk_plug_queued_count(q); + if (!is_flush_fua && !blk_queue_nomerges(q) && + blk_attempt_plug_merge(q, bio, &request_count, &same_queue_rq)) + return BLK_QC_T_NONE; rq = blk_mq_map_request(q, bio, &data); if (unlikely(!rq)) @@ -1375,9 +1372,11 @@ static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio) blk_queue_split(q, &bio, q->bio_split); - if (!is_flush_fua && !blk_queue_nomerges(q) && - blk_attempt_plug_merge(q, bio, &request_count, NULL)) - return BLK_QC_T_NONE; + if (!is_flush_fua && !blk_queue_nomerges(q)) { + if (blk_attempt_plug_merge(q, bio, &request_count, NULL)) + return BLK_QC_T_NONE; + } else + request_count = blk_plug_queued_count(q); rq = blk_mq_map_request(q, bio, &data); if (unlikely(!rq)) |