diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-02-12 11:41:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 00:03:27 -0800 |
| commit | dc4c2c31053ba5bf685d273cd62ecca406dddb2d (patch) | |
| tree | c74ac486ee668eec2a24d9a4191a855fb0eed8af /net/netlabel | |
| parent | f6ca057f1bfe251d944505fc5ba4df3762802539 (diff) | |
| download | linux-3.10-dc4c2c31053ba5bf685d273cd62ecca406dddb2d.tar.gz linux-3.10-dc4c2c31053ba5bf685d273cd62ecca406dddb2d.tar.bz2 linux-3.10-dc4c2c31053ba5bf685d273cd62ecca406dddb2d.zip | |
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 c5d9f97ef21..0bfeaab88ef 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, entry_old = netlbl_domhsh_search_def(entry->domain); if (entry_old == NULL) { entry->valid = 1; - INIT_RCU_HEAD(&entry->rcu); if (entry->domain != NULL) { u32 bkt = netlbl_domhsh_hash(entry->domain); diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index 98ed22ee2ff..852d9d7976b 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, entry->list.addr = addr->s_addr & mask->s_addr; entry->list.mask = mask->s_addr; entry->list.valid = 1; - INIT_RCU_HEAD(&entry->rcu); entry->secid = secid; spin_lock(&netlbl_unlhsh_lock); @@ -373,7 +372,6 @@ static int netlbl_unlhsh_add_addr6(struct netlbl_unlhsh_iface *iface, entry->list.addr.s6_addr32[3] &= mask->s6_addr32[3]; ipv6_addr_copy(&entry->list.mask, mask); entry->list.valid = 1; - INIT_RCU_HEAD(&entry->rcu); entry->secid = secid; spin_lock(&netlbl_unlhsh_lock); @@ -410,7 +408,6 @@ static struct netlbl_unlhsh_iface *netlbl_unlhsh_add_iface(int ifindex) INIT_LIST_HEAD(&iface->addr4_list); INIT_LIST_HEAD(&iface->addr6_list); iface->valid = 1; - INIT_RCU_HEAD(&iface->rcu); spin_lock(&netlbl_unlhsh_lock); if (ifindex > 0) { |