Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Randy Dunlap and committed by
J. Bruce Fields
dd4dc82d 02cb2858

+3 -1
+2
fs/Kconfig
··· 226 226 227 227 config LOCKD 228 228 tristate 229 + depends on FILE_LOCKING 229 230 230 231 config LOCKD_V4 231 232 bool 232 233 depends on NFSD_V3 || NFS_V3 234 + depends on FILE_LOCKING 233 235 default y 234 236 235 237 config EXPORTFS
+1 -1
fs/nfs/Kconfig
··· 1 1 config NFS_FS 2 2 tristate "NFS client support" 3 - depends on INET 3 + depends on INET && FILE_LOCKING 4 4 select LOCKD 5 5 select SUNRPC 6 6 select NFS_ACL_SUPPORT if NFS_V3_ACL