Re: [PATCH v2] lockd: fix FILE_LOCKING=n build error

J. Bruce Fields
2009-04-28T21:41:20Z

On Tue, Apr 28, 2009 at 02:01:00PM -0700, Randy Dunlap wrote:
> Trond Myklebust wrote:
> > Until someone finds time to go through the code and add in all the
> > CONFIG_FILE_LOCKING special cases, the above needs to be a 'depends on
> > INET && FILE_LOCKING'.
>
> That seems to work. Thanks.

Looks good to me.--b.

>
>
>
>
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> 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>
> ---
> 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,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