diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-05-01 23:36:28 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2014-05-01 23:36:28 +0200 |
commit | 4a470de629d5bf3088b9b62d688d43b8a400f1b1 (patch) | |
tree | 572ecbe64728996322324d21a3d1a04cac3320f9 /overrides/kpatches/bfqsched-3.15.patch | |
parent | db061c1acc7c67a41ddbc101c2e78b292fa3d139 (diff) |
bfqsched: Update to v7r3.
This also rebases the patch against latest 3.15-rc3. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'overrides/kpatches/bfqsched-3.15.patch')
-rw-r--r-- | overrides/kpatches/bfqsched-3.15.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/overrides/kpatches/bfqsched-3.15.patch b/overrides/kpatches/bfqsched-3.15.patch index 46b0811b..42eeb99b 100644 --- a/overrides/kpatches/bfqsched-3.15.patch +++ b/overrides/kpatches/bfqsched-3.15.patch @@ -1,8 +1,8 @@ diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c -index bcecdb4..c841aac 100644 +index de911a9..b7edce0 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c -@@ -401,7 +401,7 @@ static struct bfq_group *bfq_bic_update_cgroup(struct bfq_io_cq *bic) +@@ -402,7 +402,7 @@ static struct bfq_group *bfq_bic_update_cgroup(struct bfq_io_cq *bic) BUG_ON(bfqd == NULL); rcu_read_lock(); @@ -11,7 +11,7 @@ index bcecdb4..c841aac 100644 bfqg = __bfq_bic_change_cgroup(bfqd, bic, css); rcu_read_unlock(); -@@ -764,7 +764,7 @@ static int bfqio_can_attach(struct cgroup_subsys_state *css, +@@ -765,7 +765,7 @@ static int bfqio_can_attach(struct cgroup_subsys_state *css, struct io_context *ioc; int ret = 0; @@ -20,7 +20,7 @@ index bcecdb4..c841aac 100644 /* * task_lock() is needed to avoid races with * exit_io_context() -@@ -798,7 +798,7 @@ static void bfqio_attach(struct cgroup_subsys_state *css, +@@ -799,7 +799,7 @@ static void bfqio_attach(struct cgroup_subsys_state *css, * IMPORTANT NOTE: The move of more than one process at a time to a * new group has not yet been tested. */ @@ -29,7 +29,7 @@ index bcecdb4..c841aac 100644 ioc = get_task_io_context(task, GFP_ATOMIC, NUMA_NO_NODE); if (ioc) { /* -@@ -858,15 +858,13 @@ static void bfqio_css_offline(struct cgroup_subsys_state *css) +@@ -859,15 +859,13 @@ static void bfqio_css_offline(struct cgroup_subsys_state *css) mutex_unlock(&bfqio_mutex); } @@ -47,10 +47,10 @@ index bcecdb4..c841aac 100644 }; #else diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c -index 0d3503d..f733e4a 100644 +index bd0d99a..225cf01 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c -@@ -754,9 +754,9 @@ static void bfq_merged_requests(struct request_queue *q, struct request *rq, +@@ -901,9 +901,9 @@ static void bfq_merged_requests(struct request_queue *q, struct request *rq, * Reposition in fifo if next is older than rq. */ if (!list_empty(&rq->queuelist) && !list_empty(&next->queuelist) && @@ -62,7 +62,7 @@ index 0d3503d..f733e4a 100644 } if (bfqq->next_rq == next) -@@ -1341,7 +1341,7 @@ static struct request *bfq_check_fifo(struct bfq_queue *bfqq) +@@ -1504,7 +1504,7 @@ static struct request *bfq_check_fifo(struct bfq_queue *bfqq) rq = rq_entry_fifo(bfqq->fifo.next); @@ -71,10 +71,10 @@ index 0d3503d..f733e4a 100644 return NULL; return rq; -@@ -2769,7 +2769,7 @@ static void bfq_insert_request(struct request_queue *q, struct request *rq) +@@ -3047,7 +3047,7 @@ static void bfq_insert_request(struct request_queue *q, struct request *rq) */ if (bfqq->bic != NULL) - bfqq->bic->raising_time_left = 0; + bfqq->bic->wr_time_left = 0; - rq_set_fifo_time(rq, jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)]); + rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)]; list_add_tail(&rq->queuelist, &bfqq->fifo); |