Messages in this thread Patch in this message | | | Date | Tue, 28 Apr 2009 10:51:22 -0700 | From | Randy Dunlap <> | Subject | Re: [PATCH] lockd: fix FILE_LOCKING=n build error |
| |
J. Bruce Fields wrote: > On Tue, Apr 28, 2009 at 08:22:50AM -0700, Randy Dunlap wrote: >> From: Randy Dunlap <randy.dunlap@oracle.com> >> >> 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 really make sense; would it be better > to add a config dependency?
I just tried a patch like the one below instead of the first one, but it has build errors too, so more Makefile/Kconfig work is needed (by someone who knows what interfaces are needed here):
fs/built-in.o: In function `nfs_start_lockd': client.c:(.text+0xe8848): undefined reference to `nlmclnt_init' fs/built-in.o: In function `nfs_destroy_server': client.c:(.text+0xe8885): undefined reference to `nlmclnt_done' fs/built-in.o: In function `nfs_proc_lock': proc.c:(.text+0xf735f): undefined reference to `nlmclnt_proc' fs/built-in.o: In function `nfs3_proc_lock': nfs3proc.c:(.text+0xfd1df): undefined reference to `nlmclnt_proc'
lockd without FILE_LOCKING doesn't make sense, so make LOCKD and LOCKD_V4 depend on FILE_LOCKING. --- fs/Kconfig | 2 ++ fs/nfs/Kconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
--- linux-next-20090428.orig/fs/Kconfig +++ linux-next-20090428/fs/Kconfig @@ -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 --- linux-next-20090428.orig/fs/nfs/Kconfig +++ linux-next-20090428/fs/nfs/Kconfig @@ -1,7 +1,7 @@ config NFS_FS tristate "NFS client support" depends on INET - select LOCKD + select LOCKD if FILE_LOCKING select SUNRPC select NFS_ACL_SUPPORT if NFS_V3_ACL help
| |