diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-03-12 00:04:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-12 14:39:40 -0400 |
commit | efd7ef1c1929d7a0329d4349252863c04d6f1729 (patch) | |
tree | 66a1d5ba57a27fda7665da756551c10ac0ebf656 /net/openvswitch | |
parent | 6c7005f6cb1bf63bb1f505ef69364fb2cc00628e (diff) |
net: Kill hold_net release_net
hold_net and release_net were an idea that turned out to be useless.
The code has been disabled since 2008. Kill the code it is long past due.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
-rw-r--r-- | net/openvswitch/datapath.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 5bae7243c577..096c6276e6b9 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
@@ -203,7 +203,6 @@ static void destroy_dp_rcu(struct rcu_head *rcu) | |||
203 | 203 | ||
204 | ovs_flow_tbl_destroy(&dp->table); | 204 | ovs_flow_tbl_destroy(&dp->table); |
205 | free_percpu(dp->stats_percpu); | 205 | free_percpu(dp->stats_percpu); |
206 | release_net(ovs_dp_get_net(dp)); | ||
207 | kfree(dp->ports); | 206 | kfree(dp->ports); |
208 | kfree(dp); | 207 | kfree(dp); |
209 | } | 208 | } |
@@ -1501,7 +1500,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) | |||
1501 | if (dp == NULL) | 1500 | if (dp == NULL) |
1502 | goto err_free_reply; | 1501 | goto err_free_reply; |
1503 | 1502 | ||
1504 | ovs_dp_set_net(dp, hold_net(sock_net(skb->sk))); | 1503 | ovs_dp_set_net(dp, sock_net(skb->sk)); |
1505 | 1504 | ||
1506 | /* Allocate table. */ | 1505 | /* Allocate table. */ |
1507 | err = ovs_flow_tbl_init(&dp->table); | 1506 | err = ovs_flow_tbl_init(&dp->table); |
@@ -1575,7 +1574,6 @@ err_destroy_percpu: | |||
1575 | err_destroy_table: | 1574 | err_destroy_table: |
1576 | ovs_flow_tbl_destroy(&dp->table); | 1575 | ovs_flow_tbl_destroy(&dp->table); |
1577 | err_free_dp: | 1576 | err_free_dp: |
1578 | release_net(ovs_dp_get_net(dp)); | ||
1579 | kfree(dp); | 1577 | kfree(dp); |
1580 | err_free_reply: | 1578 | err_free_reply: |
1581 | kfree_skb(reply); | 1579 | kfree_skb(reply); |