---

yaml --- r: 139906 b: refs/heads/master c: ef740c3 h: refs/heads/master v: v3
git-mirror · Mar 31, 2009 · 2900578 · 2900578
1 parent 23d03c2
commit 2900578
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a40a8aed083d988df6822bb9b1b08fb7ce21e1d
+refs/heads/master: ef740c372dfd80e706dbf955d4e4aedda6c0c148
diff --git a/trunk/drivers/md/bitmap.c b/trunk/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/trunk/include/linux/raid/bitmap.h → trunk/drivers/md/bitmap.h b/trunk/include/linux/raid/bitmap.h → trunk/drivers/md/bitmap.h
diff --git a/trunk/drivers/md/linear.c b/trunk/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/trunk/include/linux/raid/linear.h → trunk/drivers/md/linear.h b/trunk/include/linux/raid/linear.h → trunk/drivers/md/linear.h
diff --git a/trunk/drivers/md/md.c b/trunk/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/trunk/drivers/md/multipath.c b/trunk/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/trunk/include/linux/raid/multipath.h → trunk/drivers/md/multipath.h b/trunk/include/linux/raid/multipath.h → trunk/drivers/md/multipath.h
diff --git a/trunk/drivers/md/raid0.c b/trunk/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/trunk/include/linux/raid/raid0.h → trunk/drivers/md/raid0.h b/trunk/include/linux/raid/raid0.h → trunk/drivers/md/raid0.h
diff --git a/trunk/drivers/md/raid1.c b/trunk/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/trunk/include/linux/raid/raid1.h → trunk/drivers/md/raid1.h b/trunk/include/linux/raid/raid1.h → trunk/drivers/md/raid1.h
diff --git a/trunk/drivers/md/raid10.c b/trunk/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/trunk/include/linux/raid/raid10.h → trunk/drivers/md/raid10.h b/trunk/include/linux/raid/raid10.h → trunk/drivers/md/raid10.h
diff --git a/trunk/drivers/md/raid5.c b/trunk/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/trunk/include/linux/raid/raid5.h → trunk/drivers/md/raid5.h b/trunk/include/linux/raid/raid5.h → trunk/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/trunk/drivers/md/raid6.h b/trunk/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 */