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

[Fabio Massimo Di Nitto]

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

Hi everybody,

the following patch fixes compilation of cnxman.c with 2.6.12rc2
replacing sk_zapped with its new substitute.

Please apply.

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

Index: cman-kernel/src/cnxman.c
===================================================================
RCS file: /cvs/cluster/cluster/cman-kernel/src/cnxman.c,v
retrieving revision 1.55
diff -u -r1.55 cnxman.c
- --- cman-kernel/src/cnxman.c	5 Apr 2005 13:43:09 -0000	1.55
+++ cman-kernel/src/cnxman.c	14 Apr 2005 14:27:03 -0000
@@ -1065,7 +1065,7 @@
 	if (!capable(CAP_NET_BIND_SERVICE))
 		return -EPERM;
 
- -	if (sk->sk_zapped == 0)
+	if (sock_flag(sk, SOCK_ZAPPED) == 0)
 		return -EINVAL;
 
 	if (addr_len != sizeof (struct sockaddr_cl))
@@ -1089,7 +1089,7 @@
 	up(&port_array_lock);
 
 	c->port = saddr->scl_port;
- -	sk->sk_zapped = 0;
+	sock_reset_flag(sk, SOCK_ZAPPED);
 
 	/* If we are not a cluster member yet then make the client wait until
 	 * we are, this allows nodes to start cluster clients at the same time
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iQIVAwUBQl6BOlA6oBJjVJ+OAQIUPBAAtPSWMm5k9JvH+fMt+H193fJfgfEWa7EL
jfwC2GP/fSAz7RmhXvChdqkrxSBt7VS5oEKwwG6kt7tfJZIvxIACaEzaOOXLidHh
UyOWJHUj0twQZQYsBEr8nN7lcfC2+jCiYSgbCoUzD/+36q/QOFoLeeAOa0am+c7t
lc4QRmBt1tfGPtf7dTVgNpwX/hZPSlLXLDaBkUBztvncTTZNmmQ15jmjufXcdj31
lGtYzc8we5540YtbWKmFG0/M6AOS0BCOBT+3vLxtwbdXIeO2c+1BOhFr3cWPYgAg
01q/TlMN504P7KyhOm7G/an/exrbzDDKflgzAadEuzDoFAFnDZG0FCdpaz/Fvd3j
YkJFPqMJuX0DuhjiHJlwwvzkcjO32RWBAs06lYlCVjyK6mf4GasUF3dJPAIIOhWh
ZHK7c0+dWyUA8GINjdJaCkKn3Yz/zmFxFLSUEZsl63A4AXlP7cc+Nz3+0VfmXbVI
c97hN/xd3dS/v4LZyE76kHxjTRCyDCKzszF/9iW+0O9mOnSc/FxLfgm8dl86xZVH
fpj2fx/8IWDWMXLANANVigXDxjJWZjSyDCZOutbY1Q/0/mUIg/CLZq18HCKjEOKu
LmK0V7ayRPop1HFuNFueWA7nOTrKYNjkuZia2uxIE4s+5i7BsiyTgWjxYZHP3LtO
9JefecsNpwc=
=QzsY
-----END PGP SIGNATURE-----