[Linux-cluster] [PATCH] Fix dlm-kernel build with 2.6.12rc2

[Fabio Massimo Di Nitto]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi everybody,

the following patch fixes compilation of nodes.c with 2.6.12rc2.

A macro called nodes_clear has been recently introduced. This leads
to a clash. I renamed the DLM one to nodes_nodes_clear only to solve
the problem, but of course my patch isn't authoritative. Feel
free to rename it as you wish :)

Signed-off-by: Fabio Massimo Di Nitto <fabbione at ubuntu.com>

Index: dlm-kernel/src/nodes.c
===================================================================
RCS file: /cvs/cluster/cluster/dlm-kernel/src/nodes.c,v
retrieving revision 1.12
diff -u -r1.12 nodes.c
- --- dlm-kernel/src/nodes.c	27 Jan 2005 09:23:45 -0000	1.12
+++ dlm-kernel/src/nodes.c	14 Apr 2005 14:28:08 -0000
@@ -277,7 +277,7 @@
 	return error;
 }
 
- -static void nodes_clear(struct list_head *head)
+static void nodes_nodes_clear(struct list_head *head)
 {
 	struct dlm_csb *csb;
 
@@ -290,13 +290,13 @@
 
 void ls_nodes_clear(struct dlm_ls *ls)
 {
- -	nodes_clear(&ls->ls_nodes);
+	nodes_nodes_clear(&ls->ls_nodes);
 	ls->ls_num_nodes = 0;
 }
 
 void ls_nodes_gone_clear(struct dlm_ls *ls)
 {
- -	nodes_clear(&ls->ls_nodes_gone);
+	nodes_nodes_clear(&ls->ls_nodes_gone);
 }
 
 int ls_nodes_init(struct dlm_ls *ls, struct dlm_recover *rv)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iQIVAwUBQl6BQlA6oBJjVJ+OAQKQYg/+OsUuKjv3gS3T0+c30QNP1hWGBY/QP250
q3stoxo1Nt8NSRmDI2CXuHpCMah5XVPmyf13nMDj2m60VrGi51Jyrt9PDbYhYbXA
W1weCsZKf7aD1SVnJ6Dauebj3eU/PPU53n1M8+6RrRqkVLnXW+MqIcEt/SAKO55V
uovdTYrZrXJYdR6uU49Ss1qdTGQP6QbLzf8ivXPzl44GlWHhYMSc4WvV3RxRslxI
n/BUhCL2MJdhX26r8w5dgL2VG5bnz3x8S8T37Eh8Bs39VAwuleW5Cfpr4MV4Yhuw
WTrkIF56BFSiqDvvLuvhVVZlAFKvqeU6Xp9kVMUMAOJ7tjTwwwbX+TTUL/YAi7Yp
UqaMk9yAhgiVsBK+/0AqHJYx1mGfZhgbQ1A3Wr0uIADDsoHI4OP3ZsaYnKlX04rm
1JoxF1I4nHg0hlgGJHLCaGTTIRuVKzIvutFFZL9oWj6fp3mxw6MYo7nWxPxjMAhT
hCfo8YjoGlpUVlnBgOSRCVUNaCXwcxNWgRyoVfn8yX+vufTQZxUCzX5SkiFcMDn1
uP8sUFvNoSvNYhzutd4Ma5pb2I+Qu4zVxKFRQ7rBSOBFn9UI4klS5Eu9JlMAzd5f
fmDK4lXDM/9yjjqSbQTNAV2gSkrwwtxfu2DSGXja/Xkh5MtPdv2OEbXGLLkTiZ8g
u/FUdUCytd8=
=pKJ1
-----END PGP SIGNATURE-----