From 26c480b2534c0a7f47f37486c38baa376b6fcb2c Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 4 Dec 2009 10:06:35 +0100
Subject: [PATCH] --- yaml --- r: 173008 b: refs/heads/master c:
 f2eecb91522686edf8199947b77f435a4031d92f h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/block/blk-cgroup.c  | 4 +---
 trunk/block/cfq-iosched.c | 1 +
 trunk/block/cfq-iosched.h | 7 +++++++
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 trunk/block/cfq-iosched.h

diff --git a/[refs] b/[refs]
index b20bb31e5793..6ec504f4faea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f5ea47712489a9d2d3cb832eb06062e4e64e0ec
+refs/heads/master: f2eecb91522686edf8199947b77f435a4031d92f
diff --git a/trunk/block/blk-cgroup.c b/trunk/block/blk-cgroup.c
index 179ddfaebc5c..73a5525cc0a2 100644
--- a/trunk/block/blk-cgroup.c
+++ b/trunk/block/blk-cgroup.c
@@ -14,9 +14,7 @@
 #include <linux/seq_file.h>
 #include <linux/kdev_t.h>
 #include "blk-cgroup.h"
-
-extern void cfq_unlink_blkio_group(void *, struct blkio_group *);
-extern void cfq_update_blkio_group_weight(struct blkio_group *, unsigned int);
+#include "cfq-iosched.h"
 
 struct blkio_cgroup blkio_root_cgroup = { .weight = 2*BLKIO_WEIGHT_DEFAULT };
 
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 08b057b1b3b2..43ec3340cb58 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -14,6 +14,7 @@
 #include <linux/ioprio.h>
 #include <linux/blktrace_api.h>
 #include "blk-cgroup.h"
+#include "cfq-iosched.h"
 
 /*
  * tunables
diff --git a/trunk/block/cfq-iosched.h b/trunk/block/cfq-iosched.h
new file mode 100644
index 000000000000..ef7b4798a349
--- /dev/null
+++ b/trunk/block/cfq-iosched.h
@@ -0,0 +1,7 @@
+#ifndef CFQ_IOSCHED_H
+#define CFQ_IOSCHED_H
+
+void cfq_unlink_blkio_group(void *, struct blkio_group *);
+void cfq_update_blkio_group_weight(struct blkio_group *, unsigned int);
+
+#endif