From ef740c372dfd80e706dbf955d4e4aedda6c0c148 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 31 Mar 2009 14:27:03 +1100 Subject: [PATCH] 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 Signed-off-by: NeilBrown --- drivers/md/bitmap.c | 2 +- {include/linux/raid => drivers/md}/bitmap.h | 0 drivers/md/linear.c | 2 +- {include/linux/raid => drivers/md}/linear.h | 0 drivers/md/md.c | 2 +- drivers/md/multipath.c | 2 +- {include/linux/raid => drivers/md}/multipath.h | 0 drivers/md/raid0.c | 2 +- {include/linux/raid => drivers/md}/raid0.h | 0 drivers/md/raid1.c | 4 ++-- {include/linux/raid => drivers/md}/raid1.h | 0 drivers/md/raid10.c | 4 ++-- {include/linux/raid => drivers/md}/raid10.h | 0 drivers/md/raid5.c | 5 ++--- {include/linux/raid => drivers/md}/raid5.h | 2 +- drivers/md/raid6.h | 2 +- 16 files changed, 13 insertions(+), 14 deletions(-) rename {include/linux/raid => drivers/md}/bitmap.h (100%) rename {include/linux/raid => drivers/md}/linear.h (100%) rename {include/linux/raid => drivers/md}/multipath.h (100%) rename {include/linux/raid => drivers/md}/raid0.h (100%) rename {include/linux/raid => drivers/md}/raid1.h (100%) rename {include/linux/raid => drivers/md}/raid10.h (100%) rename {include/linux/raid => drivers/md}/raid5.h (99%) diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 27f978dfe6a3..7666117738c7 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -27,7 +27,7 @@ #include #include #include -#include +#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 09658b218474..3603ffa9edc5 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 +#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 3efc0bceada2..9a3214c8585f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -34,7 +34,6 @@ #include #include -#include #include #include /* for invalidate_bdev */ #include @@ -45,6 +44,7 @@ #include #include #include +#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 f6d08f241671..547df09a7af3 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 +#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 c605ba805586..ef09ed04864e 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 +#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 e2466425d9ca..bff32285f8bb 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -33,8 +33,8 @@ #include "dm-bio-list.h" #include -#include -#include +#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 7301631abe04..f03dd70d12a5 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -20,8 +20,8 @@ #include "dm-bio-list.h" #include -#include -#include +#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 a5ba080d303b..f75698b1f63d 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -44,10 +44,9 @@ */ #include -#include "raid6.h" - -#include #include +#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 3b2672792457..40f1d0335c74 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 98dcde88470e..f6c13af65002 100644 --- a/drivers/md/raid6.h +++ b/drivers/md/raid6.h @@ -19,7 +19,7 @@ #define RAID6_USE_EMPTY_ZERO_PAGE 0 #include -#include +#include "raid5.h" typedef raid5_conf_t raid6_conf_t; /* Same configuration */ -- 2.20.1