From 0a2275a19d34dd778d05f4156e394ccd6414f97d Mon Sep 17 00:00:00 2001 From: Noxxx Date: Sat, 30 Dec 2017 02:36:26 +0100 Subject: [PATCH] Block: convert maple to state notifier --- block/maple-iosched.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/block/maple-iosched.c b/block/maple-iosched.c index 89b32833a321..260f1d727157 100644 --- a/block/maple-iosched.c +++ b/block/maple-iosched.c @@ -8,7 +8,7 @@ * * Maple uses a first come first serve style algorithm with seperated read/write * handling to allow for read biases. By prioritizing reads, simple tasks should improve - * in performance. Maple also uses hooks for the powersuspend driver to increase + * in performance. Maple also uses hooks for the state notifier driver to increase * expirations when power is suspended to decrease workload. */ #include @@ -17,7 +17,7 @@ #include #include #include -#include +#include #define MAPLE_IOSCHED_PATCHLEVEL (8) @@ -78,19 +78,18 @@ maple_add_request(struct request_queue *q, struct request *rq) struct maple_data *mdata = maple_get_data(q); const int sync = rq_is_sync(rq); const int dir = rq_data_dir(rq); - const bool display_on = is_display_on(); /* * Add request to the proper fifo list and set its * expire time. */ - /* inrease expiration when device is asleep */ + /* increase expiration when device is asleep */ unsigned int fifo_expire_suspended = mdata->fifo_expire[sync][dir] * sleep_latency_multiple; - if (display_on && mdata->fifo_expire[sync][dir]) { + if (!state_suspended && mdata->fifo_expire[sync][dir]) { rq->fifo_time = jiffies + mdata->fifo_expire[sync][dir]; list_add_tail(&rq->queuelist, &mdata->fifo_list[sync][dir]); - } else if (!display_on && fifo_expire_suspended) { + } else if (state_suspended && fifo_expire_suspended) { rq->fifo_time = jiffies + mdata->fifo_expire[sync][dir]; list_add_tail(&rq->queuelist, &mdata->fifo_list[sync][dir]); } @@ -206,7 +205,6 @@ maple_dispatch_requests(struct request_queue *q, int force) struct maple_data *mdata = maple_get_data(q); struct request *rq = NULL; int data_dir = READ; - const bool display_on = is_display_on(); /* * Retrieve any expired request after a batch of @@ -218,9 +216,9 @@ maple_dispatch_requests(struct request_queue *q, int force) /* Retrieve request */ if (!rq) { /* Treat writes fairly while suspended, otherwise allow them to be starved */ - if (display_on && mdata->starved >= mdata->writes_starved) + if (!state_suspended && mdata->starved >= mdata->writes_starved) data_dir = WRITE; - else if (!display_on && mdata->starved >= 1) + else if (state_suspended && mdata->starved >= 1) data_dir = WRITE; rq = maple_choose_request(mdata, data_dir);