Merge "cfq: Give a chance to arm slice idle timer in case of group_idle" (c7f045af) · Commits · e / devices / android_kernel_fairphone_FP3

block/cfq-iosched.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -2948,10 +2948,11 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd)

		/*
		* SSD device without seek penalty, disable idling. But only do so
		* for devices that support queuing, otherwise we still have a problem
		* with sync vs async workloads.
		* for devices that support queuing (and when group idle is 0),
		* 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));