problem with ipset and 2.4.31, again...

Jozsef Kadlecsik kadlec at blackhole.kfki.hu
Sat Feb 25 09:36:35 CET 2006


Hi,

On Fri, 24 Feb 2006, Piotr Chytla wrote:

> On Fri, Feb 24, 2006 at 02:15:37PM +0100, Jozsef Kadlecsik wrote:
> > > ipset from patch-o-matic-ng(r6345) fails to compile on 2.4.31/32, Problem and
> > > solution is the same as this :
> >
> > We are at rev 6470 in p-o-m-ng, I think you are using a too old release.
> >
> Sorry my mistake, It wasn't rev 6345, I'm using ftp snapshot
> patch-o-matic-ng-20060222.

You are right, the lock definition relied on lockhelp.h. Instead of
putting back the lockhelp.h dependency, the attached patch removes it
completely from the 2.4.* branch of the patch. It has been commited
in svn as well. Thank you for letting me about the problem.

Best regards,
Jozsef
-
E-mail  : kadlec at blackhole.kfki.hu, kadlec at sunserv.kfki.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : KFKI Research Institute for Particle and Nuclear Physics
          H-1525 Budapest 114, POB. 49, Hungary
-------------- next part --------------
--- linux-lockhelp/net/ipv4/netfilter/ip_set.c	2005-10-28 17:39:33.000000000 +0200
+++ linux/net/ipv4/netfilter/ip_set.c	2006-02-25 08:54:39.000000000 +0100
@@ -32,7 +32,7 @@
 
 static struct list_head set_type_list;		/* all registered sets */
 static struct ip_set **ip_set_list;		/* all individual sets */
-static DECLARE_RWLOCK(ip_set_lock);		/* protects the lists and the hash */
+static rwlock_t ip_set_lock = RW_LOCK_UNLOCKED;	/* protects the lists and the hash */
 static DECLARE_MUTEX(ip_set_app_mutex);		/* serializes user access */
 static ip_set_id_t ip_set_max = CONFIG_IP_NF_SET_MAX;
 static ip_set_id_t ip_set_bindings_hash_size =  CONFIG_IP_NF_SET_HASHSIZE;


More information about the netfilter-devel mailing list