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>

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 27f978dfe6a39a03baca9a307e45dd2805ff09dc..7666117738c75ca4eef600d6a1c754708667fa9e 100644 (file)
--- 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
similarity index 100%
rename from include/linux/raid/bitmap.h
rename to drivers/md/bitmap.h

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 09658b218474a3a8f676995f02e59fdfa10693b0..3603ffa9edc5fa113d8b9cb4625ef42dc00fc631 100644 (file)
--- 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
similarity index 100%
rename from include/linux/raid/linear.h
rename to drivers/md/linear.h

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3efc0bceada2a70e598e940ff6bf29f9d1e8b710..9a3214c8585f286ba8c743f3763065733a8289cc 100644 (file)
--- 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 f6d08f2416716f7207fe49aba23d154a5eb41fae..547df09a7af3320f1cb6c4662524b4b3976484cb 100644 (file)
--- 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
similarity index 100%
rename from include/linux/raid/multipath.h
rename to drivers/md/multipath.h

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index c605ba8055863d2d0ede52e9fe7e9c4e374bd9d3..ef09ed04864ef8f58855de556a31afc0ddd3bf75 100644 (file)
--- 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
similarity index 100%
rename from include/linux/raid/raid0.h
rename to drivers/md/raid0.h

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e2466425d9cad798edf40858183404408b319e3d..bff32285f8bbde2fa69b5d3b2ad6ad2f9d80606e 100644 (file)
--- 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
similarity index 100%
rename from include/linux/raid/raid1.h
rename to drivers/md/raid1.h

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 7301631abe0453a4791dec55ba0eff84912876c3..f03dd70d12a50502c7a9f1c1d7e2a031163b5c96 100644 (file)
--- 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
similarity index 100%
rename from include/linux/raid/raid10.h
rename to drivers/md/raid10.h

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index a5ba080d303b93bb3a4d764ea621f4bf9bc191d0..f75698b1f63d830c1dc85f387248970c9455aef4 100644 (file)
--- 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
similarity index 99%
rename from include/linux/raid/raid5.h
rename to drivers/md/raid5.h
index 3b2672792457ff08b991acb78e619f3daa3dab6e..40f1d0335c745b4269294cd5ca3dbb73bc1c2a7e 100644 (file)
--- 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 98dcde88470e4c23b8fc204e46587be0243bfa32..f6c13af6500292bbff6ce96fd391120da9af1d22 100644 (file)
--- 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 */