Re: [-mm patch] fix GFS2 circular dependency

Randy Dunlap
2007-01-29T02:06:22Z

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
>
> -