From e00ed7a14ef490d7791f0d04e8f1d6d558cc0601 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 25 Aug 2014 09:46:40 +0200
Subject: bfqsched: Update patch for kernel version 3.17.

Includes a patch for 3.17-rc1 from:

https://groups.google.com/forum/#!topic/bfq-iosched/piEzoNMGmk8

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/kpatches/bfqsched-3.17.patch | 38 ++++++++++++++++++++++++++++++++++++++
 pkgs/kpatches/bfqsched.nix        | 10 +++++-----
 pkgs/kpatches/bfqsched.patch      | 13 -------------
 3 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/kpatches/bfqsched-3.17.patch
 delete mode 100644 pkgs/kpatches/bfqsched.patch

diff --git a/pkgs/kpatches/bfqsched-3.17.patch b/pkgs/kpatches/bfqsched-3.17.patch
new file mode 100644
index 00000000..5b9effa5
--- /dev/null
+++ b/pkgs/kpatches/bfqsched-3.17.patch
@@ -0,0 +1,38 @@
+From 0daf37ef3f4ad76f3e56f888b48111c1b6c9119d Mon Sep 17 00:00:00 2001
+From: Arianna Avanzini <avanzini.arianna@gmail.com>
+Date: Sun, 17 Aug 2014 07:07:24 -0500
+Subject: [PATCH] block: Switch from BFQ-v7r6 for 3.16.0 to BFQ-v7r6 for
+ 3.17.0-rc1
+
+---
+ block/bfq-cgroup.c | 2 +-
+ block/bfq.h        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
+index f742806..eb140eb 100644
+--- a/block/bfq-cgroup.c
++++ b/block/bfq-cgroup.c
+@@ -871,7 +871,7 @@ struct cgroup_subsys bfqio_cgrp_subsys = {
+ 	.can_attach = bfqio_can_attach,
+ 	.attach = bfqio_attach,
+ 	.css_free = bfqio_destroy,
+-	.base_cftypes = bfqio_files,
++	.legacy_cftypes = bfqio_files,
+ };
+ #else
+ static inline void bfq_init_entity(struct bfq_entity *entity,
+diff --git a/block/bfq.h b/block/bfq.h
+index ebbd040..34b37bf 100644
+--- a/block/bfq.h
++++ b/block/bfq.h
+@@ -1,5 +1,5 @@
+ /*
+- * BFQ-v7r5 for 3.16.0: data structures and common functions prototypes.
++ * BFQ-v7r5 for 3.17.0-rc1: data structures and common functions prototypes.
+  *
+  * Based on ideas and code from CFQ:
+  * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
+-- 
+2.0.4
+
diff --git a/pkgs/kpatches/bfqsched.nix b/pkgs/kpatches/bfqsched.nix
index 3ba7310f..61dbcab8 100644
--- a/pkgs/kpatches/bfqsched.nix
+++ b/pkgs/kpatches/bfqsched.nix
@@ -2,7 +2,7 @@
 
 let
   bfqVersion = "v7r5";
-  kernelVersion = "3.15";
+  kernelVersion = "3.16";
   version = "${kernelVersion}.0-${bfqVersion}";
 
   baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches";
@@ -16,19 +16,19 @@ let
     (fetchPatch {
       name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-"
            + "${bfqVersion}-${kernelVersion}";
-      sha256 = "16vrdg9ky7q89sb7gp8as7qslqg1zy1n28cnyshm91qnf49wfh7g";
+      sha256 = "1f93n0hy9vmxpfmkdkss4b711mxly23r1z6n832prq3qph9xzkwm";
     })
     (fetchPatch {
       name = "0002-block-introduce-the-BFQ-"
            + "${bfqVersion}-I-O-sched-for-${kernelVersion}";
-      sha256 = "1gf4y5i9prhg9ls2g8apaiygm538khhpp35dahgv59hr3sfwsghs";
+      sha256 = "1b5dwivas7j56v47pq2wyy4dlvmk4f9y051ja9lila6rqfd4wns4";
     })
     (fetchPatch {
       name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-"
            + "${bfqVersion}-for-${kernelVersion}.0";
-      sha256 = "1q3fn6gl3lhvbqfhaarpv399id9sa32zx6ygqx4x98zmixwrsn9z";
+      sha256 = "0rjcmjigqkfplnsh0mdrjf6w9ng02yjwyql6k5kk39wf1q6vf7ch";
     })
-    ./bfqsched.patch
+    ./bfqsched-3.17.patch
   ];
 
   patch = stdenv.mkDerivation {
diff --git a/pkgs/kpatches/bfqsched.patch b/pkgs/kpatches/bfqsched.patch
deleted file mode 100644
index ae400155..00000000
--- a/pkgs/kpatches/bfqsched.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-index 4579c6dd..d1d8e67 100644
---- a/block/bfq-iosched.c
-+++ b/block/bfq-iosched.c
-@@ -199,7 +199,7 @@ static inline void bfq_schedule_dispatch(struct bfq_data *bfqd)
- {
- 	if (bfqd->queued != 0) {
- 		bfq_log(bfqd, "schedule dispatch");
--		kblockd_schedule_work(bfqd->queue, &bfqd->unplug_work);
-+		kblockd_schedule_work(&bfqd->unplug_work);
- 	}
- }
- 
-- 
cgit 1.4.1