diff options
| author | Jiri Benc <jbenc@redhat.com> | 2015-03-28 14:13:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-31 13:28:33 -0400 |
| commit | 40891e8ad630558caae26788d37bf50137b6d5d2 (patch) | |
| tree | c6e7c5039c6499f8bf72bff2383e01e36e70e62a | |
| parent | 2afa650ce297bc2048bc3d059774be9c39734565 (diff) | |
ipvlan: do not use rcu operations for address list
All accesses to ipvlan->addrs are under rtnl.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ipvlan/ipvlan_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index 1eb3f33e11cc..aaa005bd21ce 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c | |||
| @@ -505,7 +505,7 @@ static void ipvlan_link_delete(struct net_device *dev, struct list_head *head) | |||
| 505 | if (ipvlan->ipv6cnt > 0 || ipvlan->ipv4cnt > 0) { | 505 | if (ipvlan->ipv6cnt > 0 || ipvlan->ipv4cnt > 0) { |
| 506 | list_for_each_entry_safe(addr, next, &ipvlan->addrs, anode) { | 506 | list_for_each_entry_safe(addr, next, &ipvlan->addrs, anode) { |
| 507 | ipvlan_ht_addr_del(addr, !dev->dismantle); | 507 | ipvlan_ht_addr_del(addr, !dev->dismantle); |
| 508 | list_del_rcu(&addr->anode); | 508 | list_del(&addr->anode); |
| 509 | } | 509 | } |
| 510 | } | 510 | } |
| 511 | list_del_rcu(&ipvlan->pnode); | 511 | list_del_rcu(&ipvlan->pnode); |
| @@ -620,7 +620,7 @@ static int ipvlan_add_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr) | |||
| 620 | addr->master = ipvlan; | 620 | addr->master = ipvlan; |
| 621 | memcpy(&addr->ip6addr, ip6_addr, sizeof(struct in6_addr)); | 621 | memcpy(&addr->ip6addr, ip6_addr, sizeof(struct in6_addr)); |
| 622 | addr->atype = IPVL_IPV6; | 622 | addr->atype = IPVL_IPV6; |
| 623 | list_add_tail_rcu(&addr->anode, &ipvlan->addrs); | 623 | list_add_tail(&addr->anode, &ipvlan->addrs); |
| 624 | ipvlan->ipv6cnt++; | 624 | ipvlan->ipv6cnt++; |
| 625 | /* If the interface is not up, the address will be added to the hash | 625 | /* If the interface is not up, the address will be added to the hash |
| 626 | * list by ipvlan_open. | 626 | * list by ipvlan_open. |
| @@ -640,7 +640,7 @@ static void ipvlan_del_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr) | |||
| 640 | return; | 640 | return; |
| 641 | 641 | ||
| 642 | ipvlan_ht_addr_del(addr, true); | 642 | ipvlan_ht_addr_del(addr, true); |
| 643 | list_del_rcu(&addr->anode); | 643 | list_del(&addr->anode); |
| 644 | ipvlan->ipv6cnt--; | 644 | ipvlan->ipv6cnt--; |
| 645 | WARN_ON(ipvlan->ipv6cnt < 0); | 645 | WARN_ON(ipvlan->ipv6cnt < 0); |
| 646 | kfree_rcu(addr, rcu); | 646 | kfree_rcu(addr, rcu); |
| @@ -692,7 +692,7 @@ static int ipvlan_add_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr) | |||
| 692 | addr->master = ipvlan; | 692 | addr->master = ipvlan; |
| 693 | memcpy(&addr->ip4addr, ip4_addr, sizeof(struct in_addr)); | 693 | memcpy(&addr->ip4addr, ip4_addr, sizeof(struct in_addr)); |
| 694 | addr->atype = IPVL_IPV4; | 694 | addr->atype = IPVL_IPV4; |
| 695 | list_add_tail_rcu(&addr->anode, &ipvlan->addrs); | 695 | list_add_tail(&addr->anode, &ipvlan->addrs); |
| 696 | ipvlan->ipv4cnt++; | 696 | ipvlan->ipv4cnt++; |
| 697 | /* If the interface is not up, the address will be added to the hash | 697 | /* If the interface is not up, the address will be added to the hash |
| 698 | * list by ipvlan_open. | 698 | * list by ipvlan_open. |
| @@ -713,7 +713,7 @@ static void ipvlan_del_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr) | |||
| 713 | return; | 713 | return; |
| 714 | 714 | ||
| 715 | ipvlan_ht_addr_del(addr, true); | 715 | ipvlan_ht_addr_del(addr, true); |
| 716 | list_del_rcu(&addr->anode); | 716 | list_del(&addr->anode); |
| 717 | ipvlan->ipv4cnt--; | 717 | ipvlan->ipv4cnt--; |
| 718 | WARN_ON(ipvlan->ipv4cnt < 0); | 718 | WARN_ON(ipvlan->ipv4cnt < 0); |
| 719 | if (!ipvlan->ipv4cnt) | 719 | if (!ipvlan->ipv4cnt) |