2015-03-25 20:40:40

by Chengyu Song

Subject: [PATCH 1/1] nfsd: NFSD_FAULT_INJECTION depends on DEBUG_FS

NFSD_FAULT_INJECTION depends on DEBUG_FS, otherwise the debugfs_create_*
interface may return unexpected error -ENODEV, and cause system crash.

Signed-off-by: Chengyu Song <[email protected]>
---
fs/nfsd/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
index 683bf71..8b87b7a 100644
--- a/fs/nfsd/Kconfig
+++ b/fs/nfsd/Kconfig
@@ -107,7 +107,7 @@ config NFSD_V4_SECURITY_LABEL

config NFSD_FAULT_INJECTION
bool "NFS server manual fault injection"
- depends on NFSD_V4 && DEBUG_KERNEL
+ depends on NFSD_V4 && DEBUG_KERNEL && DEBUG_FS
help
This option enables support for manually injecting faults
into the NFS server. This is intended to be used for
--
2.1.0

2015-03-26 01:02:45

by J. Bruce Fields

Subject: Re: [PATCH 1/1] nfsd: NFSD_FAULT_INJECTION depends on DEBUG_FS

On Wed, Mar 25, 2015 at 04:37:07PM -0400, Chengyu Song wrote:
> NFSD_FAULT_INJECTION depends on DEBUG_FS, otherwise the debugfs_create_*
> interface may return unexpected error -ENODEV, and cause system crash.

Thanks, applying for 4.1.--b.

>
> Signed-off-by: Chengyu Song <[email protected]>
> ---
> fs/nfsd/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
> index 683bf71..8b87b7a 100644
> --- a/fs/nfsd/Kconfig
> +++ b/fs/nfsd/Kconfig
> @@ -107,7 +107,7 @@ config NFSD_V4_SECURITY_LABEL
>
> config NFSD_FAULT_INJECTION
> bool "NFS server manual fault injection"
> - depends on NFSD_V4 && DEBUG_KERNEL
> + depends on NFSD_V4 && DEBUG_KERNEL && DEBUG_FS
> help
> This option enables support for manually injecting faults
> into the NFS server. This is intended to be used for
> --
> 2.1.0