Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=001172778543c6997d3339f43085e43460e5883a
Commit:     001172778543c6997d3339f43085e43460e5883a
Parent:     67f55897ee5ffa16ca00ed39d176dc52b5066679
Author:     Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 28 17:19:50 2007 +0100
Committer:  Steven Whitehouse <[EMAIL PROTECTED]>
CommitDate: Mon Feb 5 13:38:08 2007 -0500

    [GFS2/DLM] fix GFS2 circular dependency
    
    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 <[EMAIL PROTECTED]>
    Acked-by: Randy Dunlap <[EMAIL PROTECTED]>
    Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
---
 fs/dlm/Kconfig  |    3 +--
 fs/gfs2/Kconfig |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index d1359b9..7e264b7 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -3,9 +3,8 @@ menu "Distributed Lock Manager"
 
 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
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index 2c184a9..cbd5f33 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -34,11 +34,10 @@ config GFS2_FS_LOCKING_NOLOCK
 
 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
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to