diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-24 07:46:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-24 07:46:05 -0700 |
| commit | 860448cf76c0878b83d3cf343a0436188b396b8e (patch) | |
| tree | 1f060525644c1f4405258cb9e3dd5c1d66c119f7 /fs/nfsd/Kconfig | |
| parent | ba0e4ae88f0f71b42ad8734e0c371d321554f13b (diff) | |
| parent | bff175238a2416110e2258989c462234baeb5f46 (diff) | |
| download | blackbird-op-linux-860448cf76c0878b83d3cf343a0436188b396b8e.tar.gz blackbird-op-linux-860448cf76c0878b83d3cf343a0436188b396b8e.zip | |
Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux
Pull nfsd updates from Bruce Fields:
"A quiet cycle this time; this is basically entirely bugfixes.
The few that aren't cc'd to stable are cleanup or seemed unlikely to
affect anyone much"
* 'for-4.1' of git://linux-nfs.org/~bfields/linux:
uapi: Remove kernel internal declaration
nfsd: fix nsfd startup race triggering BUG_ON
nfsd: eliminate NFSD_DEBUG
nfsd4: fix READ permission checking
nfsd4: disallow SEEK with special stateids
nfsd4: disallow ALLOCATE with special stateids
nfsd: add NFSEXP_PNFS to the exflags array
nfsd: Remove duplicate macro define for max sec label length
nfsd: allow setting acls with unenforceable DENYs
nfsd: NFSD_FAULT_INJECTION depends on DEBUG_FS
nfsd: remove unused status arg to nfsd4_cleanup_open_state
nfsd: remove bogus setting of status in nfsd4_process_open2
NFSD: Use correct reply size calculating function
NFSD: Using path_equal() for checking two paths
Diffstat (limited to 'fs/nfsd/Kconfig')
| -rw-r--r-- | fs/nfsd/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig index fc2d108f5272..a0b77fc1bd39 100644 --- a/fs/nfsd/Kconfig +++ b/fs/nfsd/Kconfig @@ -108,7 +108,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 |
