Skip to content

Commit

Permalink
md: rename some drivers/md/ files to have an "md-" prefix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike Snitzer authored and Shaohua Li committed Oct 17, 2017
1 parent 584ed9f commit 935fe09
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 12 deletions.
7 changes: 6 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/

Expand Down
5 changes: 4 additions & 1 deletion drivers/md/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/dm-raid.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion drivers/md/bitmap.c → drivers/md/md-bitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion drivers/md/md-cluster.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion drivers/md/linear.c → drivers/md/md-linear.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion drivers/md/multipath.c → drivers/md/md-multipath.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion drivers/md/md.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/raid1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) | \
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/raid10.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/raid5-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/raid5.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 935fe09

Please sign in to comment.