diff options
author | LCPD Auto Merger | 2017-02-27 17:10:09 -0600 |
---|---|---|
committer | LCPD Auto Merger | 2017-02-27 17:10:09 -0600 |
commit | 023adeb302252ecbad769b4a58fa3affa142bf62 (patch) | |
tree | 2f68ef87a306ab8fe0b7a0a32d3f7deea8e4617b /block | |
parent | 180bfa186e8df53914ee4b247f3fcbe60688d04a (diff) | |
parent | 4991a41b0c20fdaccc03211eec307954db30dfd3 (diff) | |
download | kernel-omap-023adeb302252ecbad769b4a58fa3affa142bf62.tar.gz kernel-omap-023adeb302252ecbad769b4a58fa3affa142bf62.tar.xz kernel-omap-023adeb302252ecbad769b4a58fa3affa142bf62.zip |
Merge branch 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel into ti-lsk-linux-4.4.y
TI-Feature: ti_linux_base_lsk
TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.4.y
* 'ti-linux-4.4.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel: (26 commits)
Linux 4.4.52
kvm: vmx: ensure VMCS is current while enabling PML
Revert "usb: chipidea: imx: enable CI_HDRC_SET_NON_ZERO_TTHA"
rtlwifi: rtl_usb: Fix for URB leaking when doing ifconfig up/down
block: fix double-free in the failure path of cgwb_bdi_init()
goldfish: Sanitize the broken interrupt handler
x86/platform/goldfish: Prevent unconditional loading
USB: serial: ark3116: fix register-accessor error handling
USB: serial: opticon: fix CTS retrieval at open
USB: serial: spcp8x5: fix modem-status handling
USB: serial: ftdi_sio: fix line-status over-reporting
USB: serial: ftdi_sio: fix extreme low-latency setting
USB: serial: ftdi_sio: fix modem-status error handling
USB: serial: cp210x: add new IDs for GE Bx50v3 boards
USB: serial: mos7840: fix another NULL-deref at open
tty: serial: msm: Fix module autoload
net: socket: fix recvmmsg not returning error from sock_error
ip: fix IP_CHECKSUM handling
irda: Fix lockdep annotations in hashbin_delete().
dccp: fix freeing skb too early for IPV6_RECVPKTINFO
...
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
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 6cfc6b200366..d8d63c38bf29 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c | |||
@@ -1259,12 +1259,9 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) | |||
1259 | 1259 | ||
1260 | blk_queue_split(q, &bio, q->bio_split); | 1260 | blk_queue_split(q, &bio, q->bio_split); |
1261 | 1261 | ||
1262 | if (!is_flush_fua && !blk_queue_nomerges(q)) { | 1262 | if (!is_flush_fua && !blk_queue_nomerges(q) && |
1263 | if (blk_attempt_plug_merge(q, bio, &request_count, | 1263 | blk_attempt_plug_merge(q, bio, &request_count, &same_queue_rq)) |
1264 | &same_queue_rq)) | 1264 | return BLK_QC_T_NONE; |
1265 | return BLK_QC_T_NONE; | ||
1266 | } else | ||
1267 | request_count = blk_plug_queued_count(q); | ||
1268 | 1265 | ||
1269 | rq = blk_mq_map_request(q, bio, &data); | 1266 | rq = blk_mq_map_request(q, bio, &data); |
1270 | if (unlikely(!rq)) | 1267 | if (unlikely(!rq)) |
@@ -1355,9 +1352,11 @@ static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio) | |||
1355 | 1352 | ||
1356 | blk_queue_split(q, &bio, q->bio_split); | 1353 | blk_queue_split(q, &bio, q->bio_split); |
1357 | 1354 | ||
1358 | if (!is_flush_fua && !blk_queue_nomerges(q) && | 1355 | if (!is_flush_fua && !blk_queue_nomerges(q)) { |
1359 | blk_attempt_plug_merge(q, bio, &request_count, NULL)) | 1356 | if (blk_attempt_plug_merge(q, bio, &request_count, NULL)) |
1360 | return BLK_QC_T_NONE; | 1357 | return BLK_QC_T_NONE; |
1358 | } else | ||
1359 | request_count = blk_plug_queued_count(q); | ||
1361 | 1360 | ||
1362 | rq = blk_mq_map_request(q, bio, &data); | 1361 | rq = blk_mq_map_request(q, bio, &data); |
1363 | if (unlikely(!rq)) | 1362 | if (unlikely(!rq)) |