Re: [GFS2] Fix Kconfig wrt CRC32 [8/9]

[Steven Whitehouse <swhiteho@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1037 bytes --]

Hi,

On Tue, 2006-11-28 at 10:33 -0800, Randy Dunlap wrote:
> Steven Whitehouse wrote:
[bits snipped to cut down size of reply]
> > You'll need the patch:
> > http://www.kernel.org/git/?p=linux/kernel/git/steve/gfs2-2.6-nmw.git;a=commitdiff;h=4a28fda50d864ede7d2724723949407e0e4043b8
> > as well. I'm also slightly surprised that you managed to get the errors
> > that you did, since most of those symbols appear to be networking
> > related and the DLM depends on INET which is clearly not set since NET
> > is not set.
> 
> Thanks, I'll apply that patch also and test again.
> 
> Part of the problem (IMO) is that kconfig s/w doesn't follow dependency
> chains when applying "select"s.
> 
Ah, light begins to dawn :-) Sorry for being a bit slow on the uptake...
I think I see what the problem might be now. I've attached a patch as a
possible solution, let me know if you agree. Its against my -nmw tree,
so for the current upstream it would be the same except for not needing
the "if DLM_SCTP" on the end of the select line,

Steve.


[-- Attachment #2: kconfig.diff --]
[-- Type: text/x-patch, Size: 722 bytes --]

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index b5654a2..a1d083d 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,5 +1,5 @@
 menu "Distributed Lock Manager"
-	depends on EXPERIMENTAL && INET
+	depends on EXPERIMENTAL && NET && INET
 
 config DLM
 	tristate "Distributed Lock Manager (DLM)"
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index c0791cb..6a2ffa2 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -34,7 +34,9 @@ config GFS2_FS_LOCKING_NOLOCK
 
 config GFS2_FS_LOCKING_DLM
 	tristate "GFS2 DLM locking module"
-	depends on GFS2_FS
+	depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)
+	select IP_SCTP if DLM_SCTP
+	select CONFIGFS_FS
 	select DLM
 	help
 	Multiple node locking module for GFS2