* [Cluster-devel] [-mm patch] fix GFS2 circular dependency [not found] ` <45BC7612.30701@gmail.com> @ 2007-01-28 16:19 ` Adrian Bunk 2007-01-29 1:55 ` [Cluster-devel] " Randy Dunlap 2007-01-29 9:12 ` Steven Whitehouse 0 siblings, 2 replies; 3+ messages in thread From: Adrian Bunk @ 2007-01-28 16:19 UTC (permalink / raw) To: cluster-devel.redhat.com On Sun, Jan 28, 2007 at 11:08:18AM +0100, Jiri Slaby wrote: > Andrew Morton napsal(a): > >Temporarily at > > > > http://userweb.kernel.org/~akpm/2.6.20-rc6-mm1/ > > Unable to select IPV6. Menuconfig doesn't offer it when INET is selected. > When it's not it appears in the menu, but after state change it gets away. > The same behaviour in xconfig, gconfig. > > $ mkdir ../a/tst > $ make O=../a/tst menuconfig > HOSTCC scripts/basic/fixdep > [...] > HOSTLD scripts/kconfig/mconf > scripts/kconfig/mconf arch/i386/Kconfig > Warning! Found recursive dependency: INET GFS2_FS_LOCKING_DLM SYSFS > OCFS2_FS INET > > Maybe this is the problem? Yes, patch below. > regards, cu Adrian <-- snip --> This patch fixes a circular dependency by letting GFS2_FS_LOCKING_DLM and DLM depend on instead of select SYSFS. Since SYSFS depends on EMBEDDED this change shouldn't cause any problems for users. Signed-off-by: Adrian Bunk <bunk@stusta.de> --- fs/dlm/Kconfig | 3 +-- fs/gfs2/Kconfig | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) --- linux-2.6.20-rc6-mm1/fs/gfs2/Kconfig.old 2007-01-28 16:44:17.000000000 +0100 +++ linux-2.6.20-rc6-mm1/fs/gfs2/Kconfig 2007-01-28 16:44:59.000000000 +0100 @@ -34,11 +34,10 @@ config GFS2_FS_LOCKING_DLM tristate "GFS2 DLM locking module" - depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n) + depends on GFS2_FS && SYSFS && NET && INET && (IPV6 || IPV6=n) select IP_SCTP if DLM_SCTP select CONFIGFS_FS select DLM - select SYSFS help Multiple node locking module for GFS2 --- linux-2.6.20-rc6-mm1/fs/dlm/Kconfig.old 2007-01-28 16:56:57.000000000 +0100 +++ linux-2.6.20-rc6-mm1/fs/dlm/Kconfig 2007-01-28 16:57:16.000000000 +0100 @@ -3,9 +3,8 @@ config DLM tristate "Distributed Lock Manager (DLM)" - depends on IPV6 || IPV6=n + depends on SYSFS && (IPV6 || IPV6=n) select CONFIGFS_FS - select SYSFS select IP_SCTP if DLM_SCTP help A general purpose distributed lock manager for kernel or userspace ^ permalink raw reply [flat|nested] 3+ messages in thread
* [Cluster-devel] Re: [-mm patch] fix GFS2 circular dependency 2007-01-28 16:19 ` [Cluster-devel] [-mm patch] fix GFS2 circular dependency Adrian Bunk @ 2007-01-29 1:55 ` Randy Dunlap 2007-01-29 9:12 ` Steven Whitehouse 1 sibling, 0 replies; 3+ messages in thread From: Randy Dunlap @ 2007-01-29 1:55 UTC (permalink / raw) To: cluster-devel.redhat.com On Sun, 28 Jan 2007 17:19:50 +0100 Adrian Bunk wrote: > <-- snip --> > > > This patch fixes a circular dependency by letting GFS2_FS_LOCKING_DLM > and DLM depend on instead of select SYSFS. > > Since SYSFS depends on EMBEDDED this change shouldn't cause any problems > for users. > > Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Thanks. Sorry about that. > --- > > fs/dlm/Kconfig | 3 +-- > fs/gfs2/Kconfig | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > --- linux-2.6.20-rc6-mm1/fs/gfs2/Kconfig.old 2007-01-28 16:44:17.000000000 +0100 > +++ linux-2.6.20-rc6-mm1/fs/gfs2/Kconfig 2007-01-28 16:44:59.000000000 +0100 > @@ -34,11 +34,10 @@ > > config GFS2_FS_LOCKING_DLM > tristate "GFS2 DLM locking module" > - depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n) > + depends on GFS2_FS && SYSFS && NET && INET && (IPV6 || IPV6=n) > select IP_SCTP if DLM_SCTP > select CONFIGFS_FS > select DLM > - select SYSFS > help > Multiple node locking module for GFS2 > > --- linux-2.6.20-rc6-mm1/fs/dlm/Kconfig.old 2007-01-28 16:56:57.000000000 +0100 > +++ linux-2.6.20-rc6-mm1/fs/dlm/Kconfig 2007-01-28 16:57:16.000000000 +0100 > @@ -3,9 +3,8 @@ > > config DLM > tristate "Distributed Lock Manager (DLM)" > - depends on IPV6 || IPV6=n > + depends on SYSFS && (IPV6 || IPV6=n) > select CONFIGFS_FS > - select SYSFS > select IP_SCTP if DLM_SCTP > help > A general purpose distributed lock manager for kernel or userspace > > - ^ permalink raw reply [flat|nested] 3+ messages in thread
* [Cluster-devel] Re: [-mm patch] fix GFS2 circular dependency 2007-01-28 16:19 ` [Cluster-devel] [-mm patch] fix GFS2 circular dependency Adrian Bunk 2007-01-29 1:55 ` [Cluster-devel] " Randy Dunlap @ 2007-01-29 9:12 ` Steven Whitehouse 1 sibling, 0 replies; 3+ messages in thread From: Steven Whitehouse @ 2007-01-29 9:12 UTC (permalink / raw) To: cluster-devel.redhat.com Hi, Now applied to the GFS2 -nmw git tree. Thanks, Steve. On Sun, 2007-01-28 at 17:19 +0100, Adrian Bunk wrote: > On Sun, Jan 28, 2007 at 11:08:18AM +0100, Jiri Slaby wrote: > > Andrew Morton napsal(a): > > >Temporarily at > > > > > > http://userweb.kernel.org/~akpm/2.6.20-rc6-mm1/ > > > > Unable to select IPV6. Menuconfig doesn't offer it when INET is selected. > > When it's not it appears in the menu, but after state change it gets away. > > The same behaviour in xconfig, gconfig. > > > > $ mkdir ../a/tst > > $ make O=../a/tst menuconfig > > HOSTCC scripts/basic/fixdep > > [...] > > HOSTLD scripts/kconfig/mconf > > scripts/kconfig/mconf arch/i386/Kconfig > > Warning! Found recursive dependency: INET GFS2_FS_LOCKING_DLM SYSFS > > OCFS2_FS INET > > > > Maybe this is the problem? > > Yes, patch below. > > > regards, > > cu > Adrian > > > <-- snip --> > > > This patch fixes a circular dependency by letting GFS2_FS_LOCKING_DLM > and DLM depend on instead of select SYSFS. > > Since SYSFS depends on EMBEDDED this change shouldn't cause any problems > for users. > > Signed-off-by: Adrian Bunk <bunk@stusta.de> > > --- > > fs/dlm/Kconfig | 3 +-- > fs/gfs2/Kconfig | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > --- linux-2.6.20-rc6-mm1/fs/gfs2/Kconfig.old 2007-01-28 16:44:17.000000000 +0100 > +++ linux-2.6.20-rc6-mm1/fs/gfs2/Kconfig 2007-01-28 16:44:59.000000000 +0100 > @@ -34,11 +34,10 @@ > > config GFS2_FS_LOCKING_DLM > tristate "GFS2 DLM locking module" > - depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n) > + depends on GFS2_FS && SYSFS && NET && INET && (IPV6 || IPV6=n) > select IP_SCTP if DLM_SCTP > select CONFIGFS_FS > select DLM > - select SYSFS > help > Multiple node locking module for GFS2 > > --- linux-2.6.20-rc6-mm1/fs/dlm/Kconfig.old 2007-01-28 16:56:57.000000000 +0100 > +++ linux-2.6.20-rc6-mm1/fs/dlm/Kconfig 2007-01-28 16:57:16.000000000 +0100 > @@ -3,9 +3,8 @@ > > config DLM > tristate "Distributed Lock Manager (DLM)" > - depends on IPV6 || IPV6=n > + depends on SYSFS && (IPV6 || IPV6=n) > select CONFIGFS_FS > - select SYSFS > select IP_SCTP if DLM_SCTP > help > A general purpose distributed lock manager for kernel or userspace > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-01-29 9:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20070127234928.64d8e437.akpm@osdl.org>
[not found] ` <45BC7612.30701@gmail.com>
2007-01-28 16:19 ` [Cluster-devel] [-mm patch] fix GFS2 circular dependency Adrian Bunk
2007-01-29 1:55 ` [Cluster-devel] " Randy Dunlap
2007-01-29 9:12 ` Steven Whitehouse
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).