---

yaml
---
r: 230579
b: refs/heads/master
c: 2b9408a
h: refs/heads/master
i:
  230577: a090cb4
  230575: f3d99ba
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e1ac6655104bc6e1e79d67e2df88cc8fa9b6e07
+refs/heads/master: 2b9408a45978dcda77407859148deeccf403c372

trunk/block/cfq-iosched.c

@@ -3523,25 +3523,8 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
 		}
 	}
 
-	if (!cfqd->rq_in_driver) {
+	if (!cfqd->rq_in_driver)
 		cfq_schedule_dispatch(cfqd);
-		return;
-	}
-	/*
-	 * A queue is idle at cfq_dispatch_requests(), but it gets noidle
-	 * later. We schedule a dispatch if the queue has no requests,
-	 * otherwise the disk is actually in idle till all requests
-	 * are finished even cfq_arm_slice_timer doesn't make the queue idle
-	 * */
-	cfqq = cfqd->active_queue;
-	if (!cfqq)
-		return;
-
-	if (RB_EMPTY_ROOT(&cfqq->sort_list) && !cfq_should_idle(cfqd, cfqq) &&
-	    (!cfqd->cfq_group_idle || cfqq->cfqg->nr_cfqq > 1)) {
-		cfq_del_timer(cfqd, cfqq);
-		cfq_schedule_dispatch(cfqd);
-	}
 }
 
 /*