diff options
author | Mike Snitzer <snitzer@redhat.com> | 2017-10-10 17:02:41 -0400 |
---|---|---|
committer | Shaohua Li <shli@fb.com> | 2017-10-16 19:06:36 -0700 |
commit | 935fe0983e09f4f7331ebf5ea4ae2124f6e9f9e8 (patch) | |
tree | a3debe3ff3a5c4462b416f8992577d30c06a8a8a | |
parent | 584ed9fa9532f8b9d5955628ff87ee3b2ab9f5a9 (diff) | |
download | linux-stable-935fe0983e09f4f7331ebf5ea4ae2124f6e9f9e8.tar.gz linux-stable-935fe0983e09f4f7331ebf5ea4ae2124f6e9f9e8.tar.bz2 linux-stable-935fe0983e09f4f7331ebf5ea4ae2124f6e9f9e8.zip |
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>
-rw-r--r-- | MAINTAINERS | 7 | ||||
-rw-r--r-- | drivers/md/Makefile | 5 | ||||
-rw-r--r-- | drivers/md/dm-raid.c | 2 | ||||
-rw-r--r-- | drivers/md/md-bitmap.c (renamed from drivers/md/bitmap.c) | 2 | ||||
-rw-r--r-- | drivers/md/md-bitmap.h (renamed from drivers/md/bitmap.h) | 0 | ||||
-rw-r--r-- | drivers/md/md-cluster.c | 2 | ||||
-rw-r--r-- | drivers/md/md-faulty.c (renamed from drivers/md/faulty.c) | 0 | ||||
-rw-r--r-- | drivers/md/md-linear.c (renamed from drivers/md/linear.c) | 2 | ||||
-rw-r--r-- | drivers/md/md-linear.h (renamed from drivers/md/linear.h) | 0 | ||||
-rw-r--r-- | drivers/md/md-multipath.c (renamed from drivers/md/multipath.c) | 2 | ||||
-rw-r--r-- | drivers/md/md-multipath.h (renamed from drivers/md/multipath.h) | 0 | ||||
-rw-r--r-- | drivers/md/md.c | 2 | ||||
-rw-r--r-- | drivers/md/raid1.c | 2 | ||||
-rw-r--r-- | drivers/md/raid10.c | 2 | ||||
-rw-r--r-- | drivers/md/raid5-cache.c | 2 | ||||
-rw-r--r-- | drivers/md/raid5.c | 2 |
16 files changed, 20 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 65b0c88d5ee0..7649877692b2 100644 --- 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 786ec9e86d65..693602ffdd38 100644 --- 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 1ac58c5651b7..252770696a05 100644 --- 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 index cae57b5be817..b843b53b0f65 100644 --- 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 index d15721ac07a6..d15721ac07a6 100644 --- a/drivers/md/bitmap.h +++ b/drivers/md/md-bitmap.h diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c index bf41492a2cb0..bc81ecc24c96 100644 --- 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 index 38264b38420f..38264b38420f 100644 --- a/drivers/md/faulty.c +++ b/drivers/md/md-faulty.c diff --git a/drivers/md/linear.c b/drivers/md/md-linear.c index c464fb48039a..773fc70dced7 100644 --- 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 index 8d392e6098b3..8d392e6098b3 100644 --- a/drivers/md/linear.h +++ b/drivers/md/md-linear.h diff --git a/drivers/md/multipath.c b/drivers/md/md-multipath.c index b68e0666b9b0..5c70176fa24d 100644 --- 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 index 717c60f62898..717c60f62898 100644 --- a/drivers/md/multipath.h +++ b/drivers/md/md-multipath.h diff --git a/drivers/md/md.c b/drivers/md/md.c index 707471e3cb01..97afb28c6f51 100644 --- 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 35264ad0ec70..efdabd3040e7 100644 --- 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 950fbefbedbb..862cbd162e1c 100644 --- 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 0b7406ac8ce1..2b450eee21fa 100644 --- 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 928e24a07133..10c0d87074f0 100644 --- 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) |