bfqsched: Update to v7r3.

This also rebases the patch against latest 3.15-rc3.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2 files changed, 17 insertions, 17 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);
diff --git a/overrides/kpatches/bfqsched.nix b/overrides/kpatches/bfqsched.nix
index fad3f5d4..ff09306f 100644
--- a/overrides/kpatches/bfqsched.nix
+++ b/overrides/kpatches/bfqsched.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 let
-  version = "3.14.0-v7r2";
+  version = "3.14.0-v7r3";
 
   baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches";
 
@@ -12,16 +12,16 @@ let
 
   allPatches = [
     (fetchPatch {
-      name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r2-3.14";
-      sha256 = "04vjygsg4hp81i0f78jkv51s4m7w6k3qxhrpjrasrkgyi3wxh15l";
+      name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r3-3.14";
+      sha256 = "1md84ld7lsvxwmzyd9r5znd66vgdljxvqwj47fzy2idsqyn6gjwi";
     })
     (fetchPatch {
-      name = "0002-block-introduce-the-BFQ-v7r2-I-O-sched-for-3.14";
-      sha256 = "1bz6rzg2fakfhh0grpr7z0nl85bkibl6lcw4wgmh34f3kvq89gxs";
+      name = "0002-block-introduce-the-BFQ-v7r3-I-O-sched-for-3.14";
+      sha256 = "1vavp37gwwlr1zxha2wl9yc1rhllcdb4yyahxkr1iwajwrfm3xwi";
     })
     (fetchPatch {
-      name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r2-for-3.14.0";
-      sha256 = "0dsj6hvk0dh1f3p88zyqm31sj0hczjm8k9bmsqvhn38z0c88qi8v";
+      name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r3-for-3.14.0";
+      sha256 = "1bpparpn3rglrdcwgs6hn8ggwhngrx1cy9rqn2mg9jwdz22lrlhv";
     })
     ./bfqsched-3.15.patch
   ];