[DLM] Fix DLM config [46/70]

[DLM] Fix DLM config [46/70]

[Steven Whitehouse]

>From b98c95af01c10827e3443157651eb469071391a3 Mon Sep 17 00:00:00 2001
From: Patrick Caulfield <pcaulfie@redhat.com>
Date: Wed, 15 Nov 2006 12:29:24 -0500
Subject: [PATCH] [DLM] Fix DLM config

The attached patch fixes the DLM config so that it selects the chosen network
transport. It should fix the bug where DLM can be left selected when NET gets
unselected. This incorporates all the comments received about this patch.

Cc: Adrian Bunk <bunk@stusta.de>
Cc: Andrew Morton <akpm@osdl.org>
Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---
 fs/dlm/Kconfig |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index c5985b8..b5654a2 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,10 +1,11 @@
 menu "Distributed Lock Manager"
-	depends on INET && IP_SCTP && EXPERIMENTAL
+	depends on EXPERIMENTAL && INET
 
 config DLM
 	tristate "Distributed Lock Manager (DLM)"
 	depends on IPV6 || IPV6=n
 	select CONFIGFS_FS
+	select IP_SCTP if DLM_SCTP
 	help
 	A general purpose distributed lock manager for kernel or userspace
 	applications.
-- 
1.4.1

Re: [DLM] Fix DLM config [46/70]

[Randy Dunlap]

On Thu, 30 Nov 2006 12:20:42 +0000 Steven Whitehouse wrote:

> >From b98c95af01c10827e3443157651eb469071391a3 Mon Sep 17 00:00:00 2001
> From: Patrick Caulfield <pcaulfie@redhat.com>
> Date: Wed, 15 Nov 2006 12:29:24 -0500
> Subject: [PATCH] [DLM] Fix DLM config
> 
> The attached patch fixes the DLM config so that it selects the chosen network
> transport. It should fix the bug where DLM can be left selected when NET gets
> unselected. This incorporates all the comments received about this patch.
> 
> ---
>  fs/dlm/Kconfig |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
> index c5985b8..b5654a2 100644
> --- a/fs/dlm/Kconfig
> +++ b/fs/dlm/Kconfig
> @@ -1,10 +1,11 @@
>  menu "Distributed Lock Manager"
> -	depends on INET && IP_SCTP && EXPERIMENTAL
> +	depends on EXPERIMENTAL && INET
>  
>  config DLM
>  	tristate "Distributed Lock Manager (DLM)"
>  	depends on IPV6 || IPV6=n

What does that "depends on" (above) mean???

>  	select CONFIGFS_FS
> +	select IP_SCTP if DLM_SCTP
>  	help
>  	A general purpose distributed lock manager for kernel or userspace
>  	applications.
> -- 

Thanks.
---
~Randy

Re: [DLM] Fix DLM config [46/70]

[Adrian Bunk]

On Wed, Dec 06, 2006 at 04:03:42PM -0800, Randy Dunlap wrote:
> On Thu, 30 Nov 2006 12:20:42 +0000 Steven Whitehouse wrote:
> 
> > >From b98c95af01c10827e3443157651eb469071391a3 Mon Sep 17 00:00:00 2001
> > From: Patrick Caulfield <pcaulfie@redhat.com>
> > Date: Wed, 15 Nov 2006 12:29:24 -0500
> > Subject: [PATCH] [DLM] Fix DLM config
> > 
> > The attached patch fixes the DLM config so that it selects the chosen network
> > transport. It should fix the bug where DLM can be left selected when NET gets
> > unselected. This incorporates all the comments received about this patch.
> > 
> > ---
> >  fs/dlm/Kconfig |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> > 
> > diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
> > index c5985b8..b5654a2 100644
> > --- a/fs/dlm/Kconfig
> > +++ b/fs/dlm/Kconfig
> > @@ -1,10 +1,11 @@
> >  menu "Distributed Lock Manager"
> > -	depends on INET && IP_SCTP && EXPERIMENTAL
> > +	depends on EXPERIMENTAL && INET
> >  
> >  config DLM
> >  	tristate "Distributed Lock Manager (DLM)"
> >  	depends on IPV6 || IPV6=n
> 
> What does that "depends on" (above) mean???
>...

It's coming from the select'ed IP_SCTP:

SCTP has optional IPV6 support, and this handles IPV6=m, IP_SCTP=y by 
making it an illegal configuration.

> Thanks.
> ~Randy

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed