summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-05-12 13:28:09 -0700
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-05-13 15:59:10 -0400
commitdd4dc82d4c129babca9b48b219cff0add5ff4132 (patch)
treed5dc1a1aa59796d197564451fb49fa6c13e5968c
parent02cb2858dbfe216bd4a91c4afb4e259ef3b9e151 (diff)
downloadop-kernel-dev-dd4dc82d4c129babca9b48b219cff0add5ff4132.zip
op-kernel-dev-dd4dc82d4c129babca9b48b219cff0add5ff4132.tar.gz
lockd: fix FILE_LOCKING=n build error
lockd/svclock.c is missing a header file <linux/fs.h>. <linux/fs.h> is missing a definition of locks_release_private() for the config case of FILE_LOCKING=n, causing a build error: fs/lockd/svclock.c:330: error: implicit declaration of function 'locks_release_private' lockd without FILE_LOCKING doesn't make sense, so make LOCKD and LOCKD_V4 depend on FILE_LOCKING, and make NFS depend on FILE_LOCKING. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--fs/Kconfig2
-rw-r--r--fs/nfs/Kconfig2
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 9f7270f..44ab328 100644
--- a/fs/Kconfig
+++ b/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/fs/nfs/Kconfig b/fs/nfs/Kconfig
index e67f3ec..7dbb8f2 100644
--- a/fs/nfs/Kconfig
+++ b/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
OpenPOWER on IntegriCloud