aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-03-31 14:27:03 +1100
committerNeilBrown <neilb@suse.de>2009-03-31 14:27:03 +1100
commitef740c372dfd80e706dbf955d4e4aedda6c0c148 (patch)
tree8d9ef9db346ee1ba319a125c9de83cdde049510d
parent2a40a8aed083d988df6822bb9b1b08fb7ce21e1d (diff)
downloadvexpress-lsk-ef740c372dfd80e706dbf955d4e4aedda6c0c148.tar.gz
md: move headers out of include/linux/raid/
Move the headers with the local structures for the disciplines and bitmap.h into drivers/md/ so that they are more easily grepable for hacking and not far away. md.h is left where it is for now as there are some uses from the outside. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--drivers/md/bitmap.c2
-rw-r--r--drivers/md/bitmap.h (renamed from include/linux/raid/bitmap.h)0
-rw-r--r--drivers/md/linear.c2
-rw-r--r--drivers/md/linear.h (renamed from include/linux/raid/linear.h)0
-rw-r--r--drivers/md/md.c2
-rw-r--r--drivers/md/multipath.c2
-rw-r--r--drivers/md/multipath.h (renamed from include/linux/raid/multipath.h)0
-rw-r--r--drivers/md/raid0.c2
-rw-r--r--drivers/md/raid0.h (renamed from include/linux/raid/raid0.h)0
-rw-r--r--drivers/md/raid1.c4
-rw-r--r--drivers/md/raid1.h (renamed from include/linux/raid/raid1.h)0
-rw-r--r--drivers/md/raid10.c4
-rw-r--r--drivers/md/raid10.h (renamed from include/linux/raid/raid10.h)0
-rw-r--r--drivers/md/raid5.c5
-rw-r--r--drivers/md/raid5.h (renamed from include/linux/raid/raid5.h)2
-rw-r--r--drivers/md/raid6.h2
16 files changed, 13 insertions, 14 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 27f978dfe6a..7666117738c 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -27,7 +27,7 @@
#include <linux/mount.h>
#include <linux/buffer_head.h>
#include <linux/raid/md.h>
-#include <linux/raid/bitmap.h>
+#include "bitmap.h"
/* debug macros */
diff --git a/include/linux/raid/bitmap.h b/drivers/md/bitmap.h
index e98900671ca..e98900671ca 100644
--- a/include/linux/raid/bitmap.h
+++ b/drivers/md/bitmap.h
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 09658b21847..3603ffa9edc 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -16,7 +16,7 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/raid/linear.h>
+#include "linear.h"
/*
* find which device holds a particular offset
diff --git a/include/linux/raid/linear.h b/drivers/md/linear.h
index f38b9c586af..f38b9c586af 100644
--- a/include/linux/raid/linear.h
+++ b/drivers/md/linear.h
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3efc0bceada..9a3214c8585 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -34,7 +34,6 @@
#include <linux/kthread.h>
#include <linux/raid/md.h>
-#include <linux/raid/bitmap.h>
#include <linux/sysctl.h>
#include <linux/buffer_head.h> /* for invalidate_bdev */
#include <linux/poll.h>
@@ -45,6 +44,7 @@
#include <linux/reboot.h>
#include <linux/file.h>
#include <linux/delay.h>
+#include "bitmap.h"
/* 63 partitions with the alternate major number (mdp) */
#define MdpMinorShift 6
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index f6d08f24167..547df09a7af 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/raid/multipath.h>
+#include "multipath.h"
#define MAX_WORK_PER_DISK 128
diff --git a/include/linux/raid/multipath.h b/drivers/md/multipath.h
index 6f53fc177a4..6f53fc177a4 100644
--- a/include/linux/raid/multipath.h
+++ b/drivers/md/multipath.h
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index c605ba80558..ef09ed04864 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -18,7 +18,7 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/raid/raid0.h>
+#include "raid0.h"
static void raid0_unplug(struct request_queue *q)
{
diff --git a/include/linux/raid/raid0.h b/drivers/md/raid0.h
index fd42aa87c39..fd42aa87c39 100644
--- a/include/linux/raid/raid0.h
+++ b/drivers/md/raid0.h
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e2466425d9c..bff32285f8b 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -33,8 +33,8 @@
#include "dm-bio-list.h"
#include <linux/delay.h>
-#include <linux/raid/raid1.h>
-#include <linux/raid/bitmap.h>
+#include "raid1.h"
+#include "bitmap.h"
#define DEBUG 0
#if DEBUG
diff --git a/include/linux/raid/raid1.h b/drivers/md/raid1.h
index 0a9ba7c3302..0a9ba7c3302 100644
--- a/include/linux/raid/raid1.h
+++ b/drivers/md/raid1.h
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 7301631abe0..f03dd70d12a 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -20,8 +20,8 @@
#include "dm-bio-list.h"
#include <linux/delay.h>
-#include <linux/raid/raid10.h>
-#include <linux/raid/bitmap.h>
+#include "raid10.h"
+#include "bitmap.h"
/*
* RAID10 provides a combination of RAID0 and RAID1 functionality.
diff --git a/include/linux/raid/raid10.h b/drivers/md/raid10.h
index e9091cfeb28..e9091cfeb28 100644
--- a/include/linux/raid/raid10.h
+++ b/drivers/md/raid10.h
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index a5ba080d303..f75698b1f63 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -44,10 +44,9 @@
*/
#include <linux/kthread.h>
-#include "raid6.h"
-
-#include <linux/raid/bitmap.h>
#include <linux/async_tx.h>
+#include "raid6.h"
+#include "bitmap.h"
/*
* Stripe cache
diff --git a/include/linux/raid/raid5.h b/drivers/md/raid5.h
index 3b267279245..40f1d0335c7 100644
--- a/include/linux/raid/raid5.h
+++ b/drivers/md/raid5.h
@@ -319,7 +319,7 @@ struct r6_state {
* PREREAD_ACTIVE is set, else we set DELAYED which will send it to the delayed queue.
* HANDLE gets cleared if stripe_handle leave nothing locked.
*/
-
+
struct disk_info {
mdk_rdev_t *rdev;
diff --git a/drivers/md/raid6.h b/drivers/md/raid6.h
index 98dcde88470..f6c13af6500 100644
--- a/drivers/md/raid6.h
+++ b/drivers/md/raid6.h
@@ -19,7 +19,7 @@
#define RAID6_USE_EMPTY_ZERO_PAGE 0
#include <linux/raid/md.h>
-#include <linux/raid/raid5.h>
+#include "raid5.h"
typedef raid5_conf_t raid6_conf_t; /* Same configuration */