diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-02-12 06:41:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-17 03:03:27 -0500 |
commit | dc4c2c31053ba5bf685d273cd62ecca406dddb2d (patch) | |
tree | c74ac486ee668eec2a24d9a4191a855fb0eed8af /net/netlabel | |
parent | f6ca057f1bfe251d944505fc5ba4df3762802539 (diff) |
net: remove INIT_RCU_HEAD() usage
call_rcu() will unconditionally reinitialize RCU head anyway.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlabel')
-rw-r--r-- | net/netlabel/netlabel_domainhash.c | 1 | ||||
-rw-r--r-- | net/netlabel/netlabel_unlabeled.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c index c5d9f97ef217..0bfeaab88ef5 100644 --- a/net/netlabel/netlabel_domainhash.c +++ b/net/netlabel/netlabel_domainhash.c | |||
@@ -315,7 +315,6 @@ int netlbl_domhsh_add(struct netlbl_dom_map *entry, | |||
315 | entry_old = netlbl_domhsh_search_def(entry->domain); | 315 | entry_old = netlbl_domhsh_search_def(entry->domain); |
316 | if (entry_old == NULL) { | 316 | if (entry_old == NULL) { |
317 | entry->valid = 1; | 317 | entry->valid = 1; |
318 | INIT_RCU_HEAD(&entry->rcu); | ||
319 | 318 | ||
320 | if (entry->domain != NULL) { | 319 | if (entry->domain != NULL) { |
321 | u32 bkt = netlbl_domhsh_hash(entry->domain); | 320 | u32 bkt = netlbl_domhsh_hash(entry->domain); |
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index 98ed22ee2ff4..852d9d7976b9 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c | |||
@@ -327,7 +327,6 @@ static int netlbl_unlhsh_add_addr4(struct netlbl_unlhsh_iface *iface, | |||
327 | entry->list.addr = addr->s_addr & mask->s_addr; | 327 | entry->list.addr = addr->s_addr & mask->s_addr; |
328 | entry->list.mask = mask->s_addr; | 328 | entry->list.mask = mask->s_addr; |
329 | entry->list.valid = 1; | 329 | entry->list.valid = 1; |
330 | INIT_RCU_HEAD(&entry->rcu); | ||
331 | entry->secid = secid; | 330 | entry->secid = secid; |
332 | 331 | ||
333 | spin_lock(&netlbl_unlhsh_lock); | 332 | spin_lock(&netlbl_unlhsh_lock); |
@@ -373,7 +372,6 @@ static int netlbl_unlhsh_add_addr6(struct netlbl_unlhsh_iface *iface, | |||
373 | entry->list.addr.s6_addr32[3] &= mask->s6_addr32[3]; | 372 | entry->list.addr.s6_addr32[3] &= mask->s6_addr32[3]; |
374 | ipv6_addr_copy(&entry->list.mask, mask); | 373 | ipv6_addr_copy(&entry->list.mask, mask); |
375 | entry->list.valid = 1; | 374 | entry->list.valid = 1; |
376 | INIT_RCU_HEAD(&entry->rcu); | ||
377 | entry->secid = secid; | 375 | entry->secid = secid; |
378 | 376 | ||
379 | spin_lock(&netlbl_unlhsh_lock); | 377 | spin_lock(&netlbl_unlhsh_lock); |
@@ -410,7 +408,6 @@ static struct netlbl_unlhsh_iface *netlbl_unlhsh_add_iface(int ifindex) | |||
410 | INIT_LIST_HEAD(&iface->addr4_list); | 408 | INIT_LIST_HEAD(&iface->addr4_list); |
411 | INIT_LIST_HEAD(&iface->addr6_list); | 409 | INIT_LIST_HEAD(&iface->addr6_list); |
412 | iface->valid = 1; | 410 | iface->valid = 1; |
413 | INIT_RCU_HEAD(&iface->rcu); | ||
414 | 411 | ||
415 | spin_lock(&netlbl_unlhsh_lock); | 412 | spin_lock(&netlbl_unlhsh_lock); |
416 | if (ifindex > 0) { | 413 | if (ifindex > 0) { |