2008-03-01 16:19:45

by Adrian Bunk

[permalink] [raw]
Subject: [2.6 patch] proper prototype for blk_dev_init()

This patch adds a proper prototye for blk_dev_init() in block/blk.h

Signed-off-by: Adrian Bunk <[email protected]>

---

block/blk.h | 2 ++
block/genhd.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)

4d1c0e77200be4790ad60d33cab6b4ed1956a71d foobar
diff --git a/block/blk.h b/block/blk.h
index ec898dd..ec9120f 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -32,6 +32,8 @@ void blk_recalc_rq_sectors(struct request *rq, int nsect);

void blk_queue_congestion_threshold(struct request_queue *q);

+int blk_dev_init(void);
+
/*
* Return the threshold (number of used requests) at which the queue is
* considered to be congested. It include a little hysteresis to keep the
diff --git a/block/genhd.c b/block/genhd.c
index 53f2238..abc6fed 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -17,6 +17,8 @@
#include <linux/buffer_head.h>
#include <linux/mutex.h>

+#include "blk.h"
+
static DEFINE_MUTEX(block_class_lock);
#ifndef CONFIG_SYSFS_DEPRECATED
struct kobject *block_depr;
@@ -346,8 +348,6 @@ const struct seq_operations partitions_op = {
#endif


-extern int blk_dev_init(void);
-
static struct kobject *base_probe(dev_t devt, int *part, void *data)
{
if (request_module("block-major-%d-%d", MAJOR(devt), MINOR(devt)) > 0)