summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-12-04 10:06:35 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-12-04 10:06:35 +0100
commitf2eecb91522686edf8199947b77f435a4031d92f (patch)
treee584c9d81971fb741508c176d74ef51ff45a4bcc /block
parent2f5ea47712489a9d2d3cb832eb06062e4e64e0ec (diff)
downloadlinux-stable-f2eecb91522686edf8199947b77f435a4031d92f.tar.gz
linux-stable-f2eecb91522686edf8199947b77f435a4031d92f.tar.bz2
linux-stable-f2eecb91522686edf8199947b77f435a4031d92f.zip
cfq-iosched: move IO controller declerations to a header file
They should not be declared inside some other file that's not related to CFQ. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-cgroup.c4
-rw-r--r--block/cfq-iosched.c1
-rw-r--r--block/cfq-iosched.h7
3 files changed, 9 insertions, 3 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 179ddfaebc5c..73a5525cc0a2 100644
--- a/block/blk-cgroup.c
+++ b/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/block/cfq-iosched.c b/block/cfq-iosched.c
index 08b057b1b3b2..43ec3340cb58 100644
--- a/block/cfq-iosched.c
+++ b/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/block/cfq-iosched.h b/block/cfq-iosched.h
new file mode 100644
index 000000000000..ef7b4798a349
--- /dev/null
+++ b/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