diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2009-05-12 16:28:09 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-05-13 15:59:10 -0400 |
commit | dd4dc82d4c129babca9b48b219cff0add5ff4132 (patch) | |
tree | d5dc1a1aa59796d197564451fb49fa6c13e5968c /fs/Kconfig | |
parent | 02cb2858dbfe216bd4a91c4afb4e259ef3b9e151 (diff) |
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>
Diffstat (limited to 'fs/Kconfig')
-rw-r--r-- | fs/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 9f7270f36b2a..44ab328ceb2a 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -226,10 +226,12 @@ source "fs/nfsd/Kconfig" | |||
226 | 226 | ||
227 | config LOCKD | 227 | config LOCKD |
228 | tristate | 228 | tristate |
229 | depends on FILE_LOCKING | ||
229 | 230 | ||
230 | config LOCKD_V4 | 231 | config LOCKD_V4 |
231 | bool | 232 | bool |
232 | depends on NFSD_V3 || NFS_V3 | 233 | depends on NFSD_V3 || NFS_V3 |
234 | depends on FILE_LOCKING | ||
233 | default y | 235 | default y |
234 | 236 | ||
235 | config EXPORTFS | 237 | config EXPORTFS |