From c80e7c83d56866a735236b45441f024b589f9e88 Mon Sep 17 00:00:00 2001 From: Patrick Caulfield Date: Fri, 8 Dec 2006 14:31:12 -0500 Subject: [DLM] fix compile warning This patch fixes a compile warning in lowcomms-tcp.c indicating that kmem_cache_t is deprecated. Signed-Off-By: Patrick Caulfield Signed-off-by: Steven Whitehouse --- fs/dlm/lowcomms-tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/dlm/lowcomms-tcp.c b/fs/dlm/lowcomms-tcp.c index 8f2791fc844..9be3a440c42 100644 --- a/fs/dlm/lowcomms-tcp.c +++ b/fs/dlm/lowcomms-tcp.c @@ -143,7 +143,7 @@ static DECLARE_WAIT_QUEUE_HEAD(lowcomms_recv_waitq); /* An array of pointers to connections, indexed by NODEID */ static struct connection **connections; static DECLARE_MUTEX(connections_lock); -static kmem_cache_t *con_cache; +static struct kmem_cache *con_cache; static int conn_array_size; /* List of sockets that have reads pending */ -- cgit v1.2.3 From 1003f06953472ecc34f12d9867670f475a8c1af6 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Tue, 12 Dec 2006 10:16:25 +0000 Subject: [GFS2] Fix Kconfig MIME-Version: 1.0 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 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index c0791cbacad..6a2ffa2db14 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 -- cgit v1.2.3