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>

4 files changed, 3 insertions, 40 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 1354ae83efc8..cede40d9cac9 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1864,8 +1864,7 @@ static inline
 void dev_net_set(struct net_device *dev, struct net *net)
 {
 #ifdef CONFIG_NET_NS
-        release_net(dev->nd_net);
-        dev->nd_net = hold_net(net);
+        dev->nd_net = net;
 #endif
 }
 
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index 88d2ae526961..6d67383a5114 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -95,17 +95,10 @@ static inline void fib_rule_get(struct fib_rule *rule)
         atomic_inc(&rule->refcnt);
 }
 
-static inline void fib_rule_put_rcu(struct rcu_head *head)
-{
-        struct fib_rule *rule = container_of(head, struct fib_rule, rcu);
-        release_net(rule->fr_net);
-        kfree(rule);
-}
-
 static inline void fib_rule_put(struct fib_rule *rule)
 {
         if (atomic_dec_and_test(&rule->refcnt))
-                call_rcu(&rule->rcu, fib_rule_put_rcu);
+                kfree_rcu(rule, rcu);
 }
 
 static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla)
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index e086f4030dd2..fab51ceeabf3 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -49,11 +49,6 @@ struct net {
         atomic_t                count;          /* To decided when the network
                                                  *  namespace should be shut down.
                                                  */
-#ifdef NETNS_REFCNT_DEBUG
-        atomic_t                use_count;      /* To track references we
-                                                 * destroy on demand
-                                                 */
-#endif
         spinlock_t              rules_mod_lock;
 
         atomic64_t              cookie_gen;
@@ -236,30 +231,6 @@ int net_eq(const struct net *net1, const struct net *net2)
 #endif
 
 
-#ifdef NETNS_REFCNT_DEBUG
-static inline struct net *hold_net(struct net *net)
-{
-        if (net)
-                atomic_inc(&net->use_count);
-        return net;
-}
-
-static inline void release_net(struct net *net)
-{
-        if (net)
-                atomic_dec(&net->use_count);
-}
-#else
-static inline struct net *hold_net(struct net *net)
-{
-        return net;
-}
-
-static inline void release_net(struct net *net)
-{
-}
-#endif
-
 #ifdef CONFIG_NET_NS
 
 static inline void write_pnet(struct net **pnet, struct net *net)
diff --git a/include/net/sock.h b/include/net/sock.h
index d996c633bec2..95b2c1c220f9 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2204,7 +2204,7 @@ static inline void sk_change_net(struct sock *sk, struct net *net)
 
         if (!net_eq(current_net, net)) {
                 put_net(current_net);
-                sock_net_set(sk, hold_net(net));
+                sock_net_set(sk, net);
         }
 }