Re: [-mm patch] fix GFS2 circular dependency

Steven Whitehouse
2007-01-29T09:09:18Z

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
>