Skip to contentSkip to conversation

Fix compile warning [1/2]

DLM Steven Whitehouse 3 participants 6 messages Dec 18, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw
Quoted 1 line

From c80e7c83d56866a735236b45441f024b589f9e88 Mon Sep 17 00:00:00 2001

From: Patrick Caulfield <[email protected]>
Date: Fri, 8 Dec 2006 14:31:12 -0500
Subject: [PATCH] [DLM] fix compile warning

This patch fixes a compile warning in lowcomms-tcp.c indicating that kmem_cache_t is deprecated.

---
 fs/dlm/lowcomms-tcp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
fs/dlm/lowcomms-tcp.c +1 -1
index 8f2791f..9be3a44 100644
@@ -143,7 +143,7 @@ static DECLARE_WAIT_QUEUE_HEAD(lowcomms_
 /* 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 */
Signature · 1 line
1.4.1
#1 lore raw

[GFS2] Fix Kconfig [2/2]

Quoted 1 line

From 1003f06953472ecc34f12d9867670f475a8c1af6 Mon Sep 17 00:00:00 2001

From: Steven Whitehouse <[email protected]>
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.

Cc Aleksandr Koltsoff <[email protected]>
Cc Toralf Förster <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Adrian Bunk <[email protected]>
Cc Chris Zubrzycki <[email protected]>
Cc Patrick Caulfield <[email protected]>
---
 fs/gfs2/Kconfig |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
fs/gfs2/Kconfig +3 -1
index c0791cb..6a2ffa2 100644
@@ -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
Signature · 1 line
1.4.1
#2 lore raw

[GFS2 & DLM] Pull request

Hi,

Please consider pulling the following two compile fixes for GFS2/DLM,

Steve.

------------------------------------------------------------------------------------------
The following changes since commit d1998ef38a13c4e74c69df55ccd38b0440c429b2:
Ben Collins:
ib_verbs: Use explicit if-else statements to avoid errors with do-while macros

are found in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git

Patrick Caulfield:
[DLM] fix compile warning

Steven Whitehouse:
[GFS2] Fix Kconfig

 fs/dlm/lowcomms-tcp.c |    2 +-
 fs/gfs2/Kconfig       |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
#3 lore raw

Re: [GFS2] Fix Kconfig [2/2]

In reply to Steven Whitehouse

fs/gfs2/Kconfig config GFS2_FS_LOCKING_NOLOCK · line 37

Quoted 4 lines · Steven Whitehouse

config GFS2_FS_LOCKING_DLM
tristate "GFS2 DLM locking module"

fs/gfs2/Kconfig +1 -1
-	depends on GFS2_FS
+	depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)

What is this supposed to do? IPV6 || IPV6=n is a tautology AFAICS.

	-`J'
#4 lore raw

Re: [GFS2] Fix Kconfig [2/2]

Hi,

Quoted 10 lines · Jan Engelhardt

fs/gfs2/Kconfig config GFS2_FS_LOCKING_NOLOCK · line 37

Quoted 4 lines · Steven Whitehouse

config GFS2_FS_LOCKING_DLM
tristate "GFS2 DLM locking module"

fs/gfs2/Kconfig +1 -1
-	depends on GFS2_FS
+	depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)

What is this supposed to do? IPV6 || IPV6=n is a tautology AFAICS.

	-`J'

It looks odd, I'll grant you, but see the thread entitled "Re: [PATCH] Remove logically superfluous comparisons from Kconfig files." and the answer that Russell King has just given on the same subject where he says:

Quoted 11 lines

config FOO

       tristate 'foo'
       depends on BAR || BAR=n

is not superfluous. The allowed states for FOO with the above construct are (assuming modules are enabled):

       BAR     FOO
       Y       Y,M,N
       M       M,N
       N       Y,M,N

which hopefully explains it a bit better,

Steve.

#5 lore raw

Re: [GFS2] Fix Kconfig [2/2]

In reply to Jan Engelhardt
Quoted 8 lines · Jan Engelhardt

fs/gfs2/Kconfig config GFS2_FS_LOCKING_NOLOCK · line 37

Quoted 4 lines · Steven Whitehouse

config GFS2_FS_LOCKING_DLM
tristate "GFS2 DLM locking module"

fs/gfs2/Kconfig +1 -1
-	depends on GFS2_FS
+	depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)

What is this supposed to do? IPV6 || IPV6=n is a tautology AFAICS.

no, we just went through that and russell king is correct -- see the brief series of posts from earlier this morning during which i made a fool of myself. :-P

although, it *is* curious that there appear to be only four places in the entire source tree that incorporate that type of logical check. i'm still trying to wrap my head around the rationale for that particular combination, since it does seem to be rather infrequent and (at least for me) a little non-intuitive.

rday