Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753664AbWLRJze (ORCPT ); Mon, 18 Dec 2006 04:55:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753649AbWLRJze (ORCPT ); Mon, 18 Dec 2006 04:55:34 -0500 Received: from mx1.redhat.com ([66.187.233.31]:46372 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753667AbWLRJzc (ORCPT ); Mon, 18 Dec 2006 04:55:32 -0500 Subject: [GFS2] Fix Kconfig [2/2] From: Steven Whitehouse To: cluster-devel@redhat.com, linux-kernel@vger.kernel.org Cc: Patrick Caulfield , Chris Zubrzycki , Adrian Bunk , Randy Dunlap , Toralf =?ISO-8859-1?Q?F=F6rster?= , Aleksandr Koltsoff In-Reply-To: <1166435650.3752.1263.camel@quoit.chygwyn.com> References: <1166435650.3752.1263.camel@quoit.chygwyn.com> Content-Type: text/plain; charset=UTF-8 Organization: Red Hat (UK) Ltd Date: Mon, 18 Dec 2006 09:57:29 +0000 Message-Id: <1166435849.3752.1266.camel@quoit.chygwyn.com> Mime-Version: 1.0 X-Mailer: Evolution 2.2.2 (2.2.2-5) Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1531 Lines: 47 >From 1003f06953472ecc34f12d9867670f475a8c1af6 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Tue, 12 Dec 2006 10:16:25 +0000 Subject: [PATCH] [GFS2] Fix Kconfig Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Here is a patch to fix up the Kconfig so that we don't land up with problems when people disable the NET subsystem. Thanks for all the hints and suggestions that people have sent me regarding this. Signed-off-by: Steven Whitehouse Cc: Aleksandr Koltsoff Cc: Toralf Förster Cc: Randy Dunlap Cc: Adrian Bunk Cc: Chris Zubrzycki Cc: Patrick Caulfield --- fs/gfs2/Kconfig | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index c0791cb..6a2ffa2 100644 --- a/fs/gfs2/Kconfig +++ b/fs/gfs2/Kconfig @@ -34,7 +34,9 @@ config GFS2_FS_LOCKING_NOLOCK config GFS2_FS_LOCKING_DLM tristate "GFS2 DLM locking module" - depends on GFS2_FS + depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n) + select IP_SCTP if DLM_SCTP + select CONFIGFS_FS select DLM help Multiple node locking module for GFS2 -- 1.4.1 - 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/