mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
[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: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
1dba323b3f
commit
d46557955f
1 changed files with 25 additions and 8 deletions
|
@ -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)
|
||||||
|
|
||||||
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)
|
||||||
|
|
Loading…
Add table
Reference in a new issue