mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
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:
parent
02cb2858db
commit
dd4dc82d4c
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user