lockd: fix FILE_LOCKING=n build error
Subsystems (3)
PATCH 1/1 lockd: fix FILE_LOCKING=n build error
From: Randy Dunlap <[email protected]>
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.
---
fs/Kconfig | 2 ++ fs/nfs/Kconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
fs/Kconfig renamed from fs/Kconfig~lockd-fix-file_locking=n-build-error +2 -0
@@ -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
fs/nfs/Kconfig renamed from fs/nfs/Kconfig~lockd-fix-file_locking=n-build-error +1 -1
@@ -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
_
A message that is not in the archive (sent off-list or not yet received): 200905122047.n4CKlP24029339-AB4EexQrvXRQetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
J. Bruce Fields
AppliedQuoted 9 lines · On Tue, May 12, 2009 at 01:28:09PM -0700, [email protected] wrote:
From: Randy Dunlap <[email protected]>
lockd/svclock.cis missing a header file <linux/fs.h>.<
linux/fs.h> is missing a definition oflocks_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.
Quoted 41 lines
lockd without
FILE_LOCKINGdoesn't make sense, so make LOCKD andLOCKD_V4depend onFILE_LOCKING, and make NFS depend onFILE_LOCKING.Signed-off-by Randy Dunlap <[email protected]>Cc Bruce Fields <[email protected]>Cc Trond Myklebust <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
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
fs/Kconfig renamed from fs/Kconfig~lockd-fix-file_locking=n-build-error +2
-0@@ -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 EXPORTFSdiff -puN fs/nfs/Kconfig~lockd-fix-file_locking=n-build-error
fs/nfs/Kconfigfs/nfs/Kconfig renamed from fs/nfs/Kconfig~lockd-fix-file_locking=n-build-error +1
-1@@ -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_
Quoted 5 lines · J. Bruce Fields
Quoted 4 lines · On Tue, May 12, 2009 at 01:28:09PM -0700, [email protected] wrote:
From: Randy Dunlap <[email protected]>
lockd/svclock.cis missing a header file <linux/fs.h>.
Quoted 7 lines
Quoted 5 lines
<
linux/fs.h> is missing a definition oflocks_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.
Quoted 43 lines
--b.
Quoted 41 lines
lockd without
FILE_LOCKINGdoesn't make sense, so make LOCKD andLOCKD_V4depend onFILE_LOCKING, and make NFS depend onFILE_LOCKING.Signed-off-by Randy Dunlap <[email protected]>Cc Bruce Fields <[email protected]>Cc Trond Myklebust <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
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
fs/Kconfig renamed from fs/Kconfig~lockd-fix-file_locking=n-build-error +2
-0@@ -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 EXPORTFSdiff -puN fs/nfs/Kconfig~lockd-fix-file_locking=n-build-error
fs/nfs/Kconfigfs/nfs/Kconfig renamed from fs/nfs/Kconfig~lockd-fix-file_locking=n-build-error +1
-1@@ -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_
Signature · 3 lines
~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/
Quoted 9 lines · Randy Dunlap
Quoted 8 lines · J. Bruce Fields
Quoted 7 lines · On Tue, May 12, 2009 at 01:28:09PM -0700, [email protected] wrote:
From: Randy Dunlap <[email protected]>
lockd/svclock.cis missing a header file <linux/fs.h>.<
linux/fs.h> is missing a definition oflocks_release_private()for the config case of FILE_LOCKING=n, causing a build error:
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
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.
Quoted 52 lines
Thanks.
Quoted 43 lines
--b.
Quoted 41 lines
lockd without
FILE_LOCKINGdoesn't make sense, so make LOCKD andLOCKD_V4depend onFILE_LOCKING, and make NFS depend onFILE_LOCKING.Signed-off-by Randy Dunlap <[email protected]>Cc Bruce Fields <[email protected]>Cc Trond Myklebust <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
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
fs/Kconfig renamed from fs/Kconfig~lockd-fix-file_locking=n-build-error +2
-0@@ -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 EXPORTFSdiff -puN fs/nfs/Kconfig~lockd-fix-file_locking=n-build-error
fs/nfs/Kconfigfs/nfs/Kconfig renamed from fs/nfs/Kconfig~lockd-fix-file_locking=n-build-error +1
-1@@ -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_
Signature · 3 lines
~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/