On Tue, May 12, 2009 at 01:28:09PM -0700, akpm@xxxxxxxxxxxxxxxxxxxx wrote: > From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> > > 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' > Thanks, applied for 2.6.31. --b. > 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@xxxxxxxxxx> > Cc: Bruce Fields <bfields@xxxxxxxxxxxx> > Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > fs/Kconfig | 2 ++ > fs/nfs/Kconfig | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff -puN fs/Kconfig~lockd-fix-file_locking=n-build-error fs/Kconfig > --- a/fs/Kconfig~lockd-fix-file_locking=n-build-error > +++ a/fs/Kconfig > @@ -236,10 +236,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 -puN fs/nfs/Kconfig~lockd-fix-file_locking=n-build-error fs/nfs/Kconfig > --- a/fs/nfs/Kconfig~lockd-fix-file_locking=n-build-error > +++ a/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 > _ -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
