aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-21 00:13:09 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-21 00:13:09 -0800
commitba6d8b1eba88665d12edd53385d3e26fce5613a3 (patch)
treed7e5cb727569f171795a3c3044d0001ea61ce0bd
parentbc947631d1d532c758f8fcbdeb1f7fc2f4c863f8 (diff)
parent1003f06953472ecc34f12d9867670f475a8c1af6 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [GFS2] Fix Kconfig [DLM] fix compile warning
-rw-r--r--fs/dlm/lowcomms-tcp.c2
-rw-r--r--fs/gfs2/Kconfig4
2 files changed, 4 insertions, 2 deletions
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 */
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