block: Rename cfq_dispatch_requests() to reflect exactly what it does

Commit Message

Zhihui Zhang May 1, 2016, 2:19 p.m. UTC

The function used to dispatch _multiple_ requests per call, but it is
no longer the case.

Signed-off-by: Zhihui Zhang <[e-mail]>
---
 block/cfq-iosched.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Patch

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 4a34978..a8d634a 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3480,7 +3480,8 @@  static bool cfq_may_dispatch(struct cfq_data *cfqd, struct cfq_queue *cfqq)
  * Dispatch a request from cfqq, moving them to the request queue
  * dispatch list.
  */
-static bool cfq_dispatch_request(struct cfq_data *cfqd, struct cfq_queue *cfqq)
+static bool
+__cfq_dispatch_request(struct cfq_data *cfqd, struct cfq_queue *cfqq)
 {
 	struct request *rq;
 
@@ -3515,7 +3516,7 @@  static bool cfq_dispatch_request(struct cfq_data *cfqd, struct cfq_queue *cfqq)
  * Find the cfqq that we need to service and move a request from that to the
  * dispatch list
  */
-static int cfq_dispatch_requests(struct request_queue *q, int force)
+static int cfq_dispatch_request(struct request_queue *q, int force)
 {
 	struct cfq_data *cfqd = q->elevator->elevator_data;
 	struct cfq_queue *cfqq;
@@ -3533,7 +3534,7 @@  static int cfq_dispatch_requests(struct request_queue *q, int force)
 	/*
 	 * Dispatch a request from this cfqq, if it is allowed
 	 */
-	if (!cfq_dispatch_request(cfqd, cfqq))
+	if (!__cfq_dispatch_request(cfqd, cfqq))
 		return 0;
 
 	cfqq->slice_dispatch++;
@@ -4731,7 +4732,7 @@  static struct elevator_type iosched_cfq = {
 		.elevator_merge_req_fn =	cfq_merged_requests,
 		.elevator_allow_merge_fn =	cfq_allow_merge,
 		.elevator_bio_merged_fn =	cfq_bio_merged,
-		.elevator_dispatch_fn =		cfq_dispatch_requests,
+		.elevator_dispatch_fn =		cfq_dispatch_request,
 		.elevator_add_req_fn =		cfq_insert_request,
 		.elevator_activate_req_fn =	cfq_activate_request,
 		.elevator_deactivate_req_fn =	cfq_deactivate_request,