Merge tag 'please-pull-sys_bpf' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 312393f32948689169b8f569e23093d52eed637c..db5dc159871612caaa6bf6a068977d989328e218 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -233,9 +233,13 @@ if NETWORK_FILESYSTEMS
 source "fs/nfs/Kconfig"
 source "fs/nfsd/Kconfig"
 
+config GRACE_PERIOD
+       tristate
+
 config LOCKD
        tristate
        depends on FILE_LOCKING
+       select GRACE_PERIOD
 
 config LOCKD_V4
        bool
@@ -249,7 +253,7 @@ config NFS_ACL_SUPPORT
 
 config NFS_COMMON
        bool
-       depends on NFSD || NFS_FS
+       depends on NFSD || NFS_FS || LOCKD
        default y
 
 source "net/sunrpc/Kconfig"