Re: GFS2: Pre-pull patch posting (merge window)

Steven Whitehouse
2012-03-26T10:44:25Z

Hi,

On Fri, 2012-03-23 at 18:06 -0400, Benjamin Poirier wrote:
[snip]
>
> Instead of trying to select everything in GFS2, how about doing it this way?
>
> [PATCH] gfs2: use depends instead of select in kconfig
>
> Avoids having to duplicate the dependencies of what is 'select'ed (and on
> down...)
>
> Those dependencies are currently incomplete, leading to broken builds with
> GFS2_FS_LOCKING_DLM=y and IP_SCTP=n.
>
> Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
> ---
> fs/gfs2/Kconfig | 7 ++-----
> 1 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
> index c465ae0..eb08c9e 100644
> --- a/fs/gfs2/Kconfig
> +++ b/fs/gfs2/Kconfig
> @@ -1,10 +1,6 @@
> config GFS2_FS
> tristate "GFS2 file system support"
> depends on (64BIT || LBDAF)
> - select DLM if GFS2_FS_LOCKING_DLM
> - select CONFIGFS_FS if GFS2_FS_LOCKING_DLM
> - select SYSFS if GFS2_FS_LOCKING_DLM
> - select IP_SCTP if DLM_SCTP
> select FS_POSIX_ACL
> select CRC32
> select QUOTACTL
> @@ -29,7 +25,8 @@ config GFS2_FS
>
> config GFS2_FS_LOCKING_DLM
> bool "GFS2 DLM locking"
> - depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && HOTPLUG
> + depends on (GFS2_FS!=n) && NET && INET && (IPV6 || IPV6=n) && \
> + HOTPLUG && DLM && CONFIGFS_FS && SYSFS
> help
> Multiple node locking module for GFS2
>

That looks ok to me. I've put it in the GFS2 -fixes tree, and if
everybody is happy with that I'll send a pull request shortly,

Steve.