dm-verity: allow REED_SOLOMON to be 'm' if DM_VERITY is 'm'

The dm-verity kconfig options make the common mistake of selecting a
dependency from a bool "sub-option" rather than the main tristate
option.  This unnecessarily forces the dependency to built-in ('y').

Fix this by moving the selections of REED_SOLOMON and REED_SOLOMON_DEC8
into DM_VERITY, conditional on DM_VERITY_FEC.

This allows REED_SOLOMON to be 'm' if DM_VERITY is 'm'.

Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 239c1744a9268ed5adb136efc354fe9629a8106f..c58a9a8ea54e924e0522d642643900fb6a10bb1e 100644 (file)
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -549,6 +549,8 @@ config DM_VERITY
        select CRYPTO_HASH
        select CRYPTO_LIB_SHA256
        select DM_BUFIO
+       select REED_SOLOMON if DM_VERITY_FEC
+       select REED_SOLOMON_DEC8 if DM_VERITY_FEC
        help
          This device-mapper target creates a read-only device that
          transparently validates the data on one underlying device against
@@ -598,8 +600,6 @@ config DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING
 config DM_VERITY_FEC
        bool "Verity forward error correction support"
        depends on DM_VERITY
-       select REED_SOLOMON
-       select REED_SOLOMON_DEC8
        help
          Add forward error correction support to dm-verity. This option
          makes it possible to use pre-generated error correction data to