diff options
| author | Gary Bisson <gary.bisson@boundarydevices.com> | 2018-09-24 14:01:55 +0200 |
|---|---|---|
| committer | Gary Bisson <gary.bisson@boundarydevices.com> | 2018-09-24 14:01:55 +0200 |
| commit | cc9333d7aace5c1de4e81932870b53bb6614dedd (patch) | |
| tree | 835717abb66260b86e6116fe1e1871e1c128bf06 /block/cfq-iosched.c | |
| parent | ded0ac8f40f9561d8ab2f8ef6c9ff8dc435f2b41 (diff) | |
| parent | 70915e25e1cff60c32e79e5b02e9559c1ed7bab2 (diff) | |
Merge tag 'v4.9.128' into 4.9-2.3.x-imx
This is the 4.9.128 stable release
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 513d0f233ec2..5660b0069b3f 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -2950,7 +2950,8 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd) * for devices that support queuing, otherwise we still have a problem * with sync vs async workloads. */ - if (blk_queue_nonrot(cfqd->queue) && cfqd->hw_tag) + if (blk_queue_nonrot(cfqd->queue) && cfqd->hw_tag && + !cfqd->cfq_group_idle) return; WARN_ON(!RB_EMPTY_ROOT(&cfqq->sort_list)); @@ -3866,7 +3867,8 @@ cfq_get_queue(struct cfq_data *cfqd, bool is_sync, struct cfq_io_cq *cic, goto out; } - cfqq = kmem_cache_alloc_node(cfq_pool, GFP_NOWAIT | __GFP_ZERO, + cfqq = kmem_cache_alloc_node(cfq_pool, + GFP_NOWAIT | __GFP_ZERO | __GFP_NOWARN, cfqd->queue->node); if (!cfqq) { cfqq = &cfqd->oom_cfqq; |