From: Benjamin Poirier <bpoirier@suse.com>
Subject: dm-raid45: split region hash and log, used by mirror and raid45
Patch-mainline: depends on dm-raid45 being upstream
raid45 depends on dm-region-hash and this dependency was not handled
Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
---
drivers/md/Kconfig | 6 ++++++
drivers/md/Makefile | 5 +++--
2 files changed, 9 insertions(+), 2 deletions(-)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -272,6 +272,7 @@ config DM_DEBUG_SPACE_MAPS
config DM_MIRROR
tristate "Mirror target"
depends on BLK_DEV_DM
+ select DM_REGION_HASH_LOG
---help---
Allow volume managers to mirror logical volumes, also
needed for live data migration tools such as 'pvmove'.
@@ -358,10 +359,15 @@ config DM_DELAY
If unsure, say N.
+config DM_REGION_HASH_LOG
+ tristate
+ default n
+
config DM_RAID45
tristate "RAID 4/5 target (EXPERIMENTAL)"
depends on BLK_DEV_DM && EXPERIMENTAL
select ASYNC_XOR
+ select DM_REGION_HASH_LOG
---help---
A target that supports RAID4 and RAID5 mappings.
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -37,13 +37,14 @@ obj-$(CONFIG_DM_MULTIPATH_QL) += dm-queu
obj-$(CONFIG_DM_MULTIPATH_ST) += dm-service-time.o
obj-$(CONFIG_DM_SNAPSHOT) += dm-snapshot.o
obj-$(CONFIG_DM_PERSISTENT_DATA) += persistent-data/
-obj-$(CONFIG_DM_MIRROR) += dm-mirror.o dm-log.o dm-region-hash.o
+obj-$(CONFIG_DM_MIRROR) += dm-mirror.o
+obj-$(CONFIG_DM_REGION_HASH_LOG) += 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_VERITY) += dm-verity.o
-obj-$(CONFIG_DM_RAID45) += dm-raid45.o dm-log.o dm-memcache.o
+obj-$(CONFIG_DM_RAID45) += dm-raid45.o dm-memcache.o
ifeq ($(CONFIG_DM_UEVENT),y)
dm-mod-objs += dm-uevent.o