Commit d4655795 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

[NET]: Relax the reference counting of init_net_ns

When the CONFIG_NET_NS is n there's no need in refcounting
the initial net namespace. So relax this code by making a
stupid stubs for the "n" case.
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1dba323b
...@@ -51,13 +51,12 @@ static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns) ...@@ -51,13 +51,12 @@ static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns)
} }
#endif #endif
#ifdef CONFIG_NET_NS
extern void __put_net(struct net *net); extern void __put_net(struct net *net);
static inline struct net *get_net(struct net *net) static inline struct net *get_net(struct net *net)
{ {
#ifdef CONFIG_NET
atomic_inc(&net->count); atomic_inc(&net->count);
#endif
return net; return net;
} }
...@@ -75,26 +74,44 @@ static inline struct net *maybe_get_net(struct net *net) ...@@ -75,26 +74,44 @@ static inline struct net *maybe_get_net(struct net *net)
static inline void put_net(struct net *net) static inline void put_net(struct net *net)
{ {
#ifdef CONFIG_NET
if (atomic_dec_and_test(&net->count)) if (atomic_dec_and_test(&net->count))
__put_net(net); __put_net(net);
#endif
} }
static inline struct net *hold_net(struct net *net) static inline struct net *hold_net(struct net *net)
{ {
#ifdef CONFIG_NET
atomic_inc(&net->use_count); atomic_inc(&net->use_count);
#endif
return net; return net;
} }
static inline void release_net(struct net *net) static inline void release_net(struct net *net)
{ {
#ifdef CONFIG_NET
atomic_dec(&net->use_count); atomic_dec(&net->use_count);
#endif
} }
#else
static inline struct net *get_net(struct net *net)
{
return net;
}
static inline void put_net(struct net *net)
{
}
static inline struct net *hold_net(struct net *net)
{
return net;
}
static inline void release_net(struct net *net)
{
}
static inline struct net *maybe_get_net(struct net *net)
{
return net;
}
#endif
#define for_each_net(VAR) \ #define for_each_net(VAR) \
list_for_each_entry(VAR, &net_namespace_list, list) list_for_each_entry(VAR, &net_namespace_list, list)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment