* [patch for 2.6.30? 1/1] lockd: fix FILE_LOCKING=n build error
@ 2009-05-12 20:28 akpm
[not found] ` <200905122047.n4CKlP24029339-AB4EexQrvXRQetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: akpm @ 2009-05-12 20:28 UTC (permalink / raw)
To: trond.myklebust; +Cc: linux-nfs, akpm, randy.dunlap, bfields
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 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: Bruce Fields <bfields@fieldses.org>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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
_
^ permalink raw reply [flat|nested] 4+ messages in thread[parent not found: <200905122047.n4CKlP24029339-AB4EexQrvXRQetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>]
* Re: [patch for 2.6.30? 1/1] lockd: fix FILE_LOCKING=n build error [not found] ` <200905122047.n4CKlP24029339-AB4EexQrvXRQetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org> @ 2009-05-13 19:59 ` J. Bruce Fields 2009-05-25 22:47 ` Randy Dunlap 0 siblings, 1 reply; 4+ messages in thread From: J. Bruce Fields @ 2009-05-13 19:59 UTC (permalink / raw) To: akpm; +Cc: trond.myklebust, linux-nfs, randy.dunlap On Tue, May 12, 2009 at 01:28:09PM -0700, akpm@linux-foundation.org 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' > 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@oracle.com> > Cc: Bruce Fields <bfields@fieldses.org> > Cc: Trond Myklebust <trond.myklebust@fys.uio.no> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > --- > > 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 > _ ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch for 2.6.30? 1/1] lockd: fix FILE_LOCKING=n build error 2009-05-13 19:59 ` J. Bruce Fields @ 2009-05-25 22:47 ` Randy Dunlap 2009-05-26 21:53 ` J. Bruce Fields 0 siblings, 1 reply; 4+ messages in thread From: Randy Dunlap @ 2009-05-25 22:47 UTC (permalink / raw) To: J. Bruce Fields; +Cc: akpm, trond.myklebust, linux-nfs, Stephen Rothwell J. Bruce Fields wrote: > On Tue, May 12, 2009 at 01:28:09PM -0700, akpm@linux-foundation.org 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' >> > > Thanks, applied for 2.6.31. linux-next builds still fail since this patch isn't in linux-next. Is there a way to have this patch in some linux-next tree? Thanks. > --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@oracle.com> >> Cc: Bruce Fields <bfields@fieldses.org> >> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> >> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> >> --- >> >> 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 >> _ -- ~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/ ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch for 2.6.30? 1/1] lockd: fix FILE_LOCKING=n build error 2009-05-25 22:47 ` Randy Dunlap @ 2009-05-26 21:53 ` J. Bruce Fields 0 siblings, 0 replies; 4+ messages in thread From: J. Bruce Fields @ 2009-05-26 21:53 UTC (permalink / raw) To: Randy Dunlap; +Cc: akpm, trond.myklebust, linux-nfs, Stephen Rothwell On Mon, May 25, 2009 at 03:47:26PM -0700, Randy Dunlap wrote: > J. Bruce Fields wrote: > > On Tue, May 12, 2009 at 01:28:09PM -0700, akpm@linux-foundation.org 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' > >> > > > > Thanks, applied for 2.6.31. > > linux-next builds still fail since this patch isn't in linux-next. > Is there a way to have this patch in some linux-next tree? Sorry about that--should be in my nfsd-next now. --b. > > Thanks. > > > --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@oracle.com> > >> Cc: Bruce Fields <bfields@fieldses.org> > >> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> > >> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > >> --- > >> > >> 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 > >> _ > > > -- > ~Randy > LPC 2009, Sept. 23-25, Portland, Oregon > http://linuxplumbersconf.org/2009/ ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-05-26 21:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-12 20:28 [patch for 2.6.30? 1/1] lockd: fix FILE_LOCKING=n build error akpm
[not found] ` <200905122047.n4CKlP24029339-AB4EexQrvXRQetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>
2009-05-13 19:59 ` J. Bruce Fields
2009-05-25 22:47 ` Randy Dunlap
2009-05-26 21:53 ` J. Bruce Fields
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox