md: rename some drivers/md/ files to have an "md-" prefix

Motivated by the desire to illiminate the imprecise nature of
DM-specific patches being unnecessarily sent to both the MD maintainer
and mailing-list.  Which is born out of the fact that DM files also
reside in drivers/md/

Now all MD-specific files in drivers/md/ start with either "raid" or
"md-" and the MAINTAINERS file has been updated accordingly.

Shaohua: don't change module name

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Shaohua Li <shli@fb.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 65b0c88d5ee0d292914b85c9ba45b1fee5f466ff..7649877692b257bd93cf3884d989f3cbcddf2b4c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4091,6 +4091,8 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git
 T:     quilt http://people.redhat.com/agk/patches/linux/editing/
 S:     Maintained
 F:     Documentation/device-mapper/
+F:     drivers/md/Makefile
+F:     drivers/md/Kconfig
 F:     drivers/md/dm*
 F:     drivers/md/persistent-data/
 F:     include/linux/device-mapper.h
@@ -12446,7 +12448,10 @@ M:     Shaohua Li <shli@kernel.org>
 L:     linux-raid@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
 S:     Supported
-F:     drivers/md/
+F:     drivers/md/Makefile
+F:     drivers/md/Kconfig
+F:     drivers/md/md*
+F:     drivers/md/raid*
 F:     include/linux/raid/
 F:     include/uapi/linux/raid/
 

diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index 786ec9e86d658aeb78d0cdc9adc7932bd9fc61ab..693602ffdd38f161c5cd67ce255e65d30af8498e 100644 (file)
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -18,9 +18,12 @@ dm-cache-y   += dm-cache-target.o dm-cache-metadata.o dm-cache-policy.o \
 dm-cache-smq-y   += dm-cache-policy-smq.o
 dm-era-y       += dm-era-target.o
 dm-verity-y    += dm-verity-target.o
-md-mod-y       += md.o bitmap.o
+md-mod-y       += md.o md-bitmap.o
 raid456-y      += raid5.o raid5-cache.o raid5-ppl.o
 dm-zoned-y     += dm-zoned-target.o dm-zoned-metadata.o dm-zoned-reclaim.o
+linear-y       += md-linear.o
+multipath-y    += md-multipath.o
+faulty-y       += md-faulty.o
 
 # Note: link order is important.  All raid personalities
 # and must come before md.o, as they each initialise 

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 1ac58c5651b7f8086ccba297547ff13823804706..252770696a05b586254722fe38ae1f5f60e2929c 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -12,7 +12,7 @@
 #include "raid1.h"
 #include "raid5.h"
 #include "raid10.h"
-#include "bitmap.h"
+#include "md-bitmap.h"
 
 #include <linux/device-mapper.h>
 

diff --git a/drivers/md/bitmap.c b/drivers/md/md-bitmap.c
similarity index 99%
rename from drivers/md/bitmap.c
rename to drivers/md/md-bitmap.c
index cae57b5be817a230d4f2097cdbc2eaab0a94e5e1..b843b53b0f65a8184c79782db58aa404e7785e49 100644 (file)
--- a/drivers/md/bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -29,7 +29,7 @@
 #include <linux/seq_file.h>
 #include <trace/events/block.h>
 #include "md.h"
-#include "bitmap.h"
+#include "md-bitmap.h"
 
 static inline char *bmname(struct bitmap *bitmap)
 {

diff --git a/drivers/md/bitmap.h b/drivers/md/md-bitmap.h
similarity index 100%
rename from drivers/md/bitmap.h
rename to drivers/md/md-bitmap.h

diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index bf41492a2cb0ca3b62d41233d050cb770bb1d228..bc81ecc24c96eef5734e965469a7938cd9498ad3 100644 (file)
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -15,7 +15,7 @@
 #include <linux/sched.h>
 #include <linux/raid/md_p.h>
 #include "md.h"
-#include "bitmap.h"
+#include "md-bitmap.h"
 #include "md-cluster.h"
 
 #define LVB_SIZE       64

diff --git a/drivers/md/faulty.c b/drivers/md/md-faulty.c
similarity index 100%
rename from drivers/md/faulty.c
rename to drivers/md/md-faulty.c

diff --git a/drivers/md/linear.c b/drivers/md/md-linear.c
similarity index 99%
rename from drivers/md/linear.c
rename to drivers/md/md-linear.c
index c464fb48039acf6a4039a535b91d0591c2d16cc2..773fc70dced725d42ed76c58c286983d9bcc4dd0 100644 (file)
--- a/drivers/md/linear.c
+++ b/drivers/md/md-linear.c
@@ -23,7 +23,7 @@
 #include <linux/slab.h>
 #include <trace/events/block.h>
 #include "md.h"
-#include "linear.h"
+#include "md-linear.h"
 
 /*
  * find which device holds a particular offset

diff --git a/drivers/md/linear.h b/drivers/md/md-linear.h
similarity index 100%
rename from drivers/md/linear.h
rename to drivers/md/md-linear.h

diff --git a/drivers/md/multipath.c b/drivers/md/md-multipath.c
similarity index 99%
rename from drivers/md/multipath.c
rename to drivers/md/md-multipath.c
index b68e0666b9b0bb6addccec7ba08d1e014e198dc2..5c70176fa24d67937134ffb337ca935941f9f3b2 100644 (file)
--- a/drivers/md/multipath.c
+++ b/drivers/md/md-multipath.c
@@ -25,7 +25,7 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include "md.h"
-#include "multipath.h"
+#include "md-multipath.h"
 
 #define MAX_WORK_PER_DISK 128
 

diff --git a/drivers/md/multipath.h b/drivers/md/md-multipath.h
similarity index 100%
rename from drivers/md/multipath.h
rename to drivers/md/md-multipath.h

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 707471e3cb015b3b8fc9ed3bb0e86056853d0f17..97afb28c6f511968c69a0b507c2437e836561d0a 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -69,7 +69,7 @@
 
 #include <trace/events/block.h>
 #include "md.h"
-#include "bitmap.h"
+#include "md-bitmap.h"
 #include "md-cluster.h"
 
 #ifndef MODULE

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 35264ad0ec7019778ca5d6065fde70bf2a8a6bd0..efdabd3040e74beca6eb63c57af15821c1fadc63 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -43,7 +43,7 @@
 
 #include "md.h"
 #include "raid1.h"
-#include "bitmap.h"
+#include "md-bitmap.h"
 
 #define UNSUPPORTED_MDDEV_FLAGS                \
        ((1L << MD_HAS_JOURNAL) |       \

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 950fbefbedbbbcaf173d3b05411779579073ad73..862cbd162e1c37124fc03a31a870f2f9b9331a55 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -29,7 +29,7 @@
 #include "md.h"
 #include "raid10.h"
 #include "raid0.h"
-#include "bitmap.h"
+#include "md-bitmap.h"
 
 /*
  * RAID10 provides a combination of RAID0 and RAID1 functionality.

diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 0b7406ac8ce1d9c22ede55fed0fb1d6839cb7963..2b450eee21fa98b17239d42cf04d879418aa4da5 100644 (file)
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -23,7 +23,7 @@
 #include <linux/types.h>
 #include "md.h"
 #include "raid5.h"
-#include "bitmap.h"
+#include "md-bitmap.h"
 #include "raid5-log.h"
 
 /*

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 928e24a071338ab6e1fe7668c8caa42b2803ccfe..10c0d87074f0878d9ba0205f5dda9d949b92b6d6 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -63,7 +63,7 @@
 #include "md.h"
 #include "raid5.h"
 #include "raid0.h"
-#include "bitmap.h"
+#include "md-bitmap.h"
 #include "raid5-log.h"
 
 #define UNSUPPORTED_MDDEV_FLAGS        (1L << MD_FAILFAST_SUPPORTED)