dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Randy Dunlap 2009-05-12 13:28:09 -07:00 committed by J. Bruce Fields
parent 02cb2858db
commit dd4dc82d4c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/Kconfig
View File

@ -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

2
fs/nfs/Kconfig
View File

@ -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