Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933089AbXA2CGW (ORCPT ); Sun, 28 Jan 2007 21:06:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933090AbXA2CGW (ORCPT ); Sun, 28 Jan 2007 21:06:22 -0500 Received: from agminet01.oracle.com ([141.146.126.228]:46781 "EHLO agminet01.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933089AbXA2CGW (ORCPT ); Sun, 28 Jan 2007 21:06:22 -0500 Date: Sun, 28 Jan 2007 17:55:19 -0800 From: Randy Dunlap To: Adrian Bunk Cc: Jiri Slaby , swhiteho@redhat.com, Andrew Morton , linux-kernel@vger.kernel.org, cluster-devel@redhat.com Subject: Re: [-mm patch] fix GFS2 circular dependency Message-Id: <20070128175519.60fb522c.randy.dunlap@oracle.com> In-Reply-To: <20070128161950.GS6017@stusta.de> References: <20070127234928.64d8e437.akpm@osdl.org> <45BC7612.30701@gmail.com> <20070128161950.GS6017@stusta.de> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.3.0 (GTK+ 2.8.10; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Whitelist: TRUE X-Whitelist: TRUE X-Brightmail-Tracker: AAAAAQAAAAI= Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1780 Lines: 60 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 Acked-by: Randy Dunlap 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 > > - - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/