Merge remote-tracking branch 'md/for-next'

[karo-tx-linux.git] / drivers / md / Kconfig

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index eed1fec2d97bc78af6794f8544e101adbf227ad0..edcf4ab66e0046eafc0ac05a10d32d602c4f6829 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -212,6 +212,17 @@ config BLK_DEV_DM
 
          If unsure, say N.
 
+config DM_MQ_DEFAULT
+       bool "request-based DM: use blk-mq I/O path by default"
+       depends on BLK_DEV_DM
+       ---help---
+         This option enables the blk-mq based I/O path for request-based
+         DM devices by default.  With the option the dm_mod.use_blk_mq
+         module/boot option defaults to Y, without it to N, but it can
+         still be overriden either way.
+
+         If unsure say N.
+
 config DM_DEBUG
        bool "Device mapper debugging support"
        depends on BLK_DEV_DM
@@ -448,4 +459,20 @@ config DM_SWITCH
 
          If unsure, say N.
 
+config DM_LOG_WRITES
+       tristate "Log writes target support"
+       depends on BLK_DEV_DM
+       ---help---
+         This device-mapper target takes two devices, one device to use
+         normally, one to log all write operations done to the first device.
+         This is for use by file system developers wishing to verify that
+         their fs is writing a consitent file system at all times by allowing
+         them to replay the log in a variety of ways and to check the
+         contents.
+
+         To compile this code as a module, choose M here: the module will
+         be called dm-log-writes.
+
+         If unsure, say N.
+
 endif # MD