From 298fb372984a808ccba9ca15a9cf0f393b3259b4 Mon Sep 17 00:00:00 2001
From: Mike Snitzer <snitzer@redhat.com>
Date: Tue, 10 Nov 2020 13:41:53 -0500
Subject: [PATCH] dm: rename multipath path selector source files to have
 "dm-ps" prefix

Additional prefix helps clarify that these source files implement path
selectors.

Required updating Makefile to still build modules _without_ the
"dm-ps" prefix to preserve dm-multipath's ability to autoload path
selector modules. While at it, cleaned up some DM whitespace in
Makefile.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---
 drivers/md/Makefile                           | 19 ++++++++++++-------
 ...time.c => dm-ps-historical-service-time.c} |  0
 .../{dm-io-affinity.c => dm-ps-io-affinity.c} |  0
 ...dm-queue-length.c => dm-ps-queue-length.c} |  0
 .../{dm-round-robin.c => dm-ps-round-robin.c} |  0
 ...dm-service-time.c => dm-ps-service-time.c} |  0
 6 files changed, 12 insertions(+), 7 deletions(-)
 rename drivers/md/{dm-historical-service-time.c => dm-ps-historical-service-time.c} (100%)
 rename drivers/md/{dm-io-affinity.c => dm-ps-io-affinity.c} (100%)
 rename drivers/md/{dm-queue-length.c => dm-ps-queue-length.c} (100%)
 rename drivers/md/{dm-round-robin.c => dm-ps-round-robin.c} (100%)
 rename drivers/md/{dm-service-time.c => dm-ps-service-time.c} (100%)

diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index 4f95f332d015..ef7ddc27685c 100644
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -7,23 +7,28 @@ dm-mod-y	+= dm.o dm-table.o dm-target.o dm-linear.o dm-stripe.o \
 		   dm-ioctl.o dm-io.o dm-kcopyd.o dm-sysfs.o dm-stats.o \
 		   dm-rq.o
 dm-multipath-y	+= dm-path-selector.o dm-mpath.o
+dm-historical-service-time-y += dm-ps-historical-service-time.o
+dm-io-affinity-y += dm-ps-io-affinity.o
+dm-queue-length-y += dm-ps-queue-length.o
+dm-round-robin-y += dm-ps-round-robin.o
+dm-service-time-y += dm-ps-service-time.o
 dm-snapshot-y	+= dm-snap.o dm-exception-store.o dm-snap-transient.o \
 		    dm-snap-persistent.o
 dm-mirror-y	+= dm-raid1.o
-dm-log-userspace-y \
-		+= dm-log-userspace-base.o dm-log-userspace-transfer.o
+dm-log-userspace-y += dm-log-userspace-base.o dm-log-userspace-transfer.o
 dm-bio-prison-y += dm-bio-prison-v1.o dm-bio-prison-v2.o
 dm-thin-pool-y	+= dm-thin.o dm-thin-metadata.o
 dm-cache-y	+= dm-cache-target.o dm-cache-metadata.o dm-cache-policy.o \
 		    dm-cache-background-tracker.o
-dm-cache-smq-y   += dm-cache-policy-smq.o
+dm-cache-smq-y	+= dm-cache-policy-smq.o
 dm-ebs-y	+= dm-ebs-target.o
 dm-era-y	+= dm-era-target.o
 dm-clone-y	+= dm-clone-target.o dm-clone-metadata.o
 dm-verity-y	+= dm-verity-target.o
+dm-zoned-y	+= dm-zoned-target.o dm-zoned-metadata.o dm-zoned-reclaim.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
@@ -62,12 +67,12 @@ obj-$(CONFIG_DM_MULTIPATH_HST)	+= dm-historical-service-time.o
 obj-$(CONFIG_DM_MULTIPATH_IOA)	+= dm-io-affinity.o
 obj-$(CONFIG_DM_SWITCH)		+= dm-switch.o
 obj-$(CONFIG_DM_SNAPSHOT)	+= dm-snapshot.o
-obj-$(CONFIG_DM_PERSISTENT_DATA)	+= persistent-data/
+obj-$(CONFIG_DM_PERSISTENT_DATA) += persistent-data/
 obj-$(CONFIG_DM_MIRROR)		+= dm-mirror.o dm-log.o dm-region-hash.o
 obj-$(CONFIG_DM_LOG_USERSPACE)	+= dm-log-userspace.o
 obj-$(CONFIG_DM_ZERO)		+= dm-zero.o
-obj-$(CONFIG_DM_RAID)	+= dm-raid.o
-obj-$(CONFIG_DM_THIN_PROVISIONING)	+= dm-thin-pool.o
+obj-$(CONFIG_DM_RAID)		+= dm-raid.o
+obj-$(CONFIG_DM_THIN_PROVISIONING) += dm-thin-pool.o
 obj-$(CONFIG_DM_VERITY)		+= dm-verity.o
 obj-$(CONFIG_DM_CACHE)		+= dm-cache.o
 obj-$(CONFIG_DM_CACHE_SMQ)	+= dm-cache-smq.o
diff --git a/drivers/md/dm-historical-service-time.c b/drivers/md/dm-ps-historical-service-time.c
similarity index 100%
rename from drivers/md/dm-historical-service-time.c
rename to drivers/md/dm-ps-historical-service-time.c
diff --git a/drivers/md/dm-io-affinity.c b/drivers/md/dm-ps-io-affinity.c
similarity index 100%
rename from drivers/md/dm-io-affinity.c
rename to drivers/md/dm-ps-io-affinity.c
diff --git a/drivers/md/dm-queue-length.c b/drivers/md/dm-ps-queue-length.c
similarity index 100%
rename from drivers/md/dm-queue-length.c
rename to drivers/md/dm-ps-queue-length.c
diff --git a/drivers/md/dm-round-robin.c b/drivers/md/dm-ps-round-robin.c
similarity index 100%
rename from drivers/md/dm-round-robin.c
rename to drivers/md/dm-ps-round-robin.c
diff --git a/drivers/md/dm-service-time.c b/drivers/md/dm-ps-service-time.c
similarity index 100%
rename from drivers/md/dm-service-time.c
rename to drivers/md/dm-ps-service-time.c
-- 
GitLab