summaryrefslogtreecommitdiffstats
path: root/fs/Kconfig
diff options
context:
space:
mode:
authorJeff Layton <jlayton@primarydata.com>2014-09-12 16:40:20 -0400
committerJ. Bruce Fields <bfields@redhat.com>2014-09-17 16:33:11 -0400
commitf7790029655f79cdcee4fa7c7884e0c2795ebebe (patch)
tree9181503273f1355a506a7658ec0115c20c2047d0 /fs/Kconfig
parentf0c63124a6165792f6e37e4b5983792d009e1ce8 (diff)
downloadlinux-f7790029655f79cdcee4fa7c7884e0c2795ebebe.tar.bz2
lockd: move lockd's grace period handling into its own module
Currently, all of the grace period handling is part of lockd. Eventually though we'd like to be able to build v4-only servers, at which point we'll need to put all of this elsewhere. Move the code itself into fs/nfs_common and have it build a grace.ko module. Then, rejigger the Kconfig options so that both nfsd and lockd enable it automatically. Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Diffstat (limited to 'fs/Kconfig')
-rw-r--r--fs/Kconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 312393f32948..db5dc1598716 100644
--- 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"