From: Jan Engelhardt <jengelh@medozas.de>
Date: Mon, 2 Mar 2009 20:25:32 +0000 (+0100)
Subject: ipset: replace RW_LOCK_UNLOCKED
X-Git-Tag: v1.12~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c322a0119fed4e317761336aef96ea3989540a5;p=thirdparty%2Fxtables-addons.git

ipset: replace RW_LOCK_UNLOCKED

ipset uses RW_LOCK_UNLOCKED directly, but this is not quite right,
and causes compilation errors with 2.6.29-rt.
---

diff --git a/extensions/ipset/ip_set.c b/extensions/ipset/ip_set.c
index 12cbe20..0928e8c 100644
--- a/extensions/ipset/ip_set.c
+++ b/extensions/ipset/ip_set.c
@@ -877,7 +877,7 @@ ip_set_create(const char *name,
 	set = kmalloc(sizeof(struct ip_set), GFP_KERNEL);
 	if (!set)
 		return -ENOMEM;
-	set->lock = RW_LOCK_UNLOCKED;
+	rwlock_init(&set->lock);
 	strncpy(set->name, name, IP_SET_MAXNAMELEN);
 	set->binding = IP_SET_INVALID_ID;
 	atomic_set(&set->ref, 0);