Commit dd4dc82d authored May 12, 2009 by Randy Dunlap Committed by J. Bruce Fields May 13, 2009

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>

parent 02cb2858

fs/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

fs/nfs/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		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

Admin message