From 38eccb56340e0037a964165ac9e7d3e10c01d952 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 12 May 2009 13:28:09 -0700 Subject: [PATCH] --- yaml --- r: 153684 b: refs/heads/master c: dd4dc82d4c129babca9b48b219cff0add5ff4132 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/Kconfig | 2 ++ trunk/fs/nfs/Kconfig | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c53b00845ac3..05dca3a16805 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02cb2858dbfe216bd4a91c4afb4e259ef3b9e151 +refs/heads/master: dd4dc82d4c129babca9b48b219cff0add5ff4132 diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig index 9f7270f36b2a..44ab328ceb2a 100644 --- a/trunk/fs/Kconfig +++ b/trunk/fs/Kconfig @@ -226,10 +226,12 @@ source "fs/nfsd/Kconfig" config LOCKD tristate + depends on FILE_LOCKING config LOCKD_V4 bool depends on NFSD_V3 || NFS_V3 + depends on FILE_LOCKING default y config EXPORTFS diff --git a/trunk/fs/nfs/Kconfig b/trunk/fs/nfs/Kconfig index e67f3ec07736..7dbb8f27b9d6 100644 --- a/trunk/fs/nfs/Kconfig +++ b/trunk/fs/nfs/Kconfig @@ -1,6 +1,6 @@ config NFS_FS tristate "NFS client support" - depends on INET + depends on INET && FILE_LOCKING select LOCKD select SUNRPC select NFS_ACL_SUPPORT if NFS_V3_ACL