Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 184255
b: refs/heads/master
c: dc4c2c3
h: refs/heads/master
i:
  184253: cf48b23
  184251: 168bc93
  184247: 35aac05
  184239: a688430
  184223: 39e5e77
  184191: 755627a
v: v3
  • Loading branch information
Alexey Dobriyan authored and David S. Miller committed Feb 17, 2010
1 parent c57fd3d commit 7c44901
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f6ca057f1bfe251d944505fc5ba4df3762802539
refs/heads/master: dc4c2c31053ba5bf685d273cd62ecca406dddb2d
1 change: 0 additions & 1 deletion trunk/net/core/drop_monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@ static int dropmon_net_event(struct notifier_block *ev_block,

new_stat->dev = dev;
new_stat->last_rx = jiffies;
INIT_RCU_HEAD(&new_stat->rcu);
spin_lock(&trace_state_lock);
list_add_rcu(&new_stat->list, &hw_stats_list);
spin_unlock(&trace_state_lock);
Expand Down
1 change: 0 additions & 1 deletion trunk/net/ipv6/sit.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ ipip6_tunnel_add_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a, int chg)
goto out;
}

INIT_RCU_HEAD(&p->rcu_head);
p->next = t->prl;
p->addr = a->addr;
p->flags = a->flags;
Expand Down
1 change: 0 additions & 1 deletion trunk/net/ipv6/xfrm6_tunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ static u32 __xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr)
if (!x6spi)
goto out;

INIT_RCU_HEAD(&x6spi->rcu_head);
memcpy(&x6spi->addr, saddr, sizeof(x6spi->addr));
x6spi->spi = spi;
atomic_set(&x6spi->refcnt, 1);
Expand Down
1 change: 0 additions & 1 deletion trunk/net/netlabel/netlabel_domainhash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions trunk/net/netlabel/netlabel_unlabeled.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion trunk/net/sctp/bind_addr.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new,
addr->valid = 1;

INIT_LIST_HEAD(&addr->list);
INIT_RCU_HEAD(&addr->rcu);

/* We always hold a socket lock when calling this function,
* and that acts as a writer synchronizing lock.
Expand Down
1 change: 0 additions & 1 deletion trunk/net/sctp/ipv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
addr->a.v6.sin6_scope_id = dev->ifindex;
addr->valid = 1;
INIT_LIST_HEAD(&addr->list);
INIT_RCU_HEAD(&addr->rcu);
list_add_tail(&addr->list, addrlist);
}
}
Expand Down
1 change: 0 additions & 1 deletion trunk/net/sctp/protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ static void sctp_v4_copy_addrlist(struct list_head *addrlist,
addr->a.v4.sin_addr.s_addr = ifa->ifa_local;
addr->valid = 1;
INIT_LIST_HEAD(&addr->list);
INIT_RCU_HEAD(&addr->rcu);
list_add_tail(&addr->list, addrlist);
}
}
Expand Down

0 comments on commit 7c44901

Please sign in to comment.