From 0a6d18a964caa023168ad4a3ab2e1899274b860e Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 31 Mar 2009 14:33:13 +1100
Subject: [PATCH] --- yaml --- r: 139910 b: refs/heads/master c:
 43b2e5d86d8bdd77386226db0bc961529492c043 h: refs/heads/master v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/md/bitmap.c                            | 2 +-
 trunk/drivers/md/faulty.c                            | 2 +-
 trunk/drivers/md/linear.c                            | 2 +-
 trunk/drivers/md/md.c                                | 2 +-
 trunk/{include/linux/raid/md_k.h => drivers/md/md.h} | 0
 trunk/drivers/md/multipath.c                         | 2 +-
 trunk/drivers/md/raid0.c                             | 2 +-
 trunk/drivers/md/raid1.c                             | 2 +-
 trunk/drivers/md/raid10.c                            | 2 +-
 trunk/drivers/md/raid5.c                             | 2 +-
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename trunk/{include/linux/raid/md_k.h => drivers/md/md.h} (100%)

diff --git a/[refs] b/[refs]
index 081b66504540..fadae8291cf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bff61975b3d6c18ee31457cc5b4d73042f44915f
+refs/heads/master: 43b2e5d86d8bdd77386226db0bc961529492c043
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index 1df012e9d73d..623292a5473e 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -27,7 +27,7 @@
 #include <linux/file.h>
 #include <linux/mount.h>
 #include <linux/buffer_head.h>
-#include <linux/raid/md_k.h>
+#include "md.h"
 #include "bitmap.h"
 
 /* debug macros */
diff --git a/trunk/drivers/md/faulty.c b/trunk/drivers/md/faulty.c
index cc5d2cf08dfc..7b66b9fca29d 100644
--- a/trunk/drivers/md/faulty.c
+++ b/trunk/drivers/md/faulty.c
@@ -64,7 +64,7 @@
 #define MaxFault	50
 #include <linux/blkdev.h>
 #include <linux/raid/md_u.h>
-#include <linux/raid/md_k.h>
+#include "md.h"
 #include <linux/seq_file.h>
 
 
diff --git a/trunk/drivers/md/linear.c b/trunk/drivers/md/linear.c
index c43c3b60ef09..f2488343ed4a 100644
--- a/trunk/drivers/md/linear.c
+++ b/trunk/drivers/md/linear.c
@@ -18,8 +18,8 @@
 
 #include <linux/blkdev.h>
 #include <linux/raid/md_u.h>
-#include <linux/raid/md_k.h>
 #include <linux/seq_file.h>
+#include "md.h"
 #include "linear.h"
 
 /*
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 11d6e0e1045a..aad0ac54bf90 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -45,9 +45,9 @@
 #include <linux/reboot.h>
 #include <linux/file.h>
 #include <linux/delay.h>
-#include <linux/raid/md_k.h>
 #include <linux/raid/md_p.h>
 #include <linux/raid/md_u.h>
+#include "md.h"
 #include "bitmap.h"
 
 #define DEBUG 0
diff --git a/trunk/include/linux/raid/md_k.h b/trunk/drivers/md/md.h
similarity index 100%
rename from trunk/include/linux/raid/md_k.h
rename to trunk/drivers/md/md.h
diff --git a/trunk/drivers/md/multipath.c b/trunk/drivers/md/multipath.c
index 148b3cd058bf..0ed1005afb58 100644
--- a/trunk/drivers/md/multipath.c
+++ b/trunk/drivers/md/multipath.c
@@ -21,8 +21,8 @@
 
 #include <linux/blkdev.h>
 #include <linux/raid/md_u.h>
-#include <linux/raid/md_k.h>
 #include <linux/seq_file.h>
+#include "md.h"
 #include "multipath.h"
 
 #define MAX_WORK_PER_DISK 128
diff --git a/trunk/drivers/md/raid0.c b/trunk/drivers/md/raid0.c
index 64e4c77a1568..3d06df86da87 100644
--- a/trunk/drivers/md/raid0.c
+++ b/trunk/drivers/md/raid0.c
@@ -19,8 +19,8 @@
 */
 
 #include <linux/blkdev.h>
-#include <linux/raid/md_k.h>
 #include <linux/seq_file.h>
+#include "md.h"
 #include "raid0.h"
 
 static void raid0_unplug(struct request_queue *q)
diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c
index 253b09c86eca..051ecfa61514 100644
--- a/trunk/drivers/md/raid1.c
+++ b/trunk/drivers/md/raid1.c
@@ -33,8 +33,8 @@
 
 #include <linux/delay.h>
 #include <linux/blkdev.h>
-#include <linux/raid/md_k.h>
 #include <linux/seq_file.h>
+#include "md.h"
 #include "dm-bio-list.h"
 #include "raid1.h"
 #include "bitmap.h"
diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c
index 186e1b199d46..fea61e3dcd95 100644
--- a/trunk/drivers/md/raid10.c
+++ b/trunk/drivers/md/raid10.c
@@ -20,8 +20,8 @@
 
 #include <linux/delay.h>
 #include <linux/blkdev.h>
-#include <linux/raid/md_k.h>
 #include <linux/seq_file.h>
+#include "md.h"
 #include "dm-bio-list.h"
 #include "raid10.h"
 #include "bitmap.h"
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 816157e7d8e0..849478e9afdc 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -44,10 +44,10 @@
  */
 
 #include <linux/blkdev.h>
-#include <linux/raid/md_k.h>
 #include <linux/kthread.h>
 #include <linux/async_tx.h>
 #include <linux/seq_file.h>
+#include "md.h"
 #include "raid5.h"
 #include "raid6.h"
 #include "bitmap.h"