diff mbox series

[-block] fault-inject: fix build error when FAULT_INJECTION_CONFIGFS=y and CONFIGFS_FS=m

Message ID 20230415125705.180426-1-akinobu.mita@gmail.com (mailing list archive)
State New, archived
Headers show
Series [-block] fault-inject: fix build error when FAULT_INJECTION_CONFIGFS=y and CONFIGFS_FS=m | expand

Commit Message

Akinobu Mita April 15, 2023, 12:57 p.m. UTC
This fixes a build error when CONFIG_FAULT_INJECTION_CONFIGFS=y and
CONFIG_CONFIGFS_FS=m.

Since the fault-injection library cannot built as a module, avoid building
configfs as a module.

Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202304150025.K0hczLR4-lkp@intel.com/
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
 lib/Kconfig.debug | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jens Axboe April 15, 2023, 8:40 p.m. UTC | #1
On Sat, 15 Apr 2023 21:57:05 +0900, Akinobu Mita wrote:
> This fixes a build error when CONFIG_FAULT_INJECTION_CONFIGFS=y and
> CONFIG_CONFIGFS_FS=m.
> 
> Since the fault-injection library cannot built as a module, avoid building
> configfs as a module.
> 
> 
> [...]

Applied, thanks!

[1/1] fault-inject: fix build error when FAULT_INJECTION_CONFIGFS=y and CONFIGFS_FS=m
      commit: 5347c9321845e5a94be19ea951746d4f2b8b194f

Best regards,
Geert Uytterhoeven April 16, 2023, 9:53 a.m. UTC | #2
Hi Mita-san,

On Sat, Apr 15, 2023 at 3:09 PM Akinobu Mita <akinobu.mita@gmail.com> wrote:
> This fixes a build error when CONFIG_FAULT_INJECTION_CONFIGFS=y and
> CONFIG_CONFIGFS_FS=m.
>
> Since the fault-injection library cannot built as a module, avoid building
> configfs as a module.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Link: https://lore.kernel.org/oe-kbuild-all/202304150025.K0hczLR4-lkp@intel.com/
> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>

Thanks for your patch!

> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -1979,7 +1979,8 @@ config FAIL_SUNRPC
>
>  config FAULT_INJECTION_CONFIGFS
>         bool "Configfs interface for fault-injection capabilities"
> -       depends on FAULT_INJECTION && CONFIGFS_FS
> +       depends on FAULT_INJECTION
> +       select CONFIGFS_FS

My first thought was "please do not select CONFIGFS_FS", but
apparently this is what most users do, so I guess it's OK.

Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>

The alternative would be to do:

-       depends on FAULT_INJECTION && CONFIGFS_FS
+       depends on FAULT_INJECTION && (CONFIGFS_FS=y ||
CONFIGFS_FS=FAULT_INJECTION)

>         help
>           This option allows configfs-based drivers to dynamically configure
>           fault-injection via configfs.  Each parameter for driver-specific

Gr{oetje,eeting}s,

                        Geert
Arnd Bergmann April 16, 2023, 10:55 a.m. UTC | #3
On Sun, Apr 16, 2023, at 11:53, Geert Uytterhoeven wrote:
>
> -       depends on FAULT_INJECTION && CONFIGFS_FS
> +       depends on FAULT_INJECTION && (CONFIGFS_FS=y ||
> CONFIGFS_FS=FAULT_INJECTION)

FAULT_INJECTION is a bool symbol, so the last part is not
needed here.

     Arnd
diff mbox series

Patch

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 6f64b49a2a8e..ce51d4dc6803 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1979,7 +1979,8 @@  config FAIL_SUNRPC
 
 config FAULT_INJECTION_CONFIGFS
 	bool "Configfs interface for fault-injection capabilities"
-	depends on FAULT_INJECTION && CONFIGFS_FS
+	depends on FAULT_INJECTION
+	select CONFIGFS_FS
 	help
 	  This option allows configfs-based drivers to dynamically configure
 	  fault-injection via configfs.  Each parameter for driver-specific