Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba6d8b1e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bc947631 1003f069

fs/dlm/lowcomms-tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

fs/gfs2/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -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