redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

netns: move {inc,dec}_net_namespaces into #ifdef 

With the newly enforced limit on the number of namespaces,
we get a build warning if CONFIG_NETNS is disabled:

net/core/net_namespace.c:273:13: error: 'dec_net_namespaces' defined but not used [-Werror=unused-function]
net/core/net_namespace.c:268:24: error: 'inc_net_namespaces' defined but not used [-Werror=unused-function]

This moves the two added functions inside the #ifdef that guards
their callers.

Fixes: 703286608a ("netns: Add a limit on the number of net namespaces")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
hifive-unleashed-5.1
Arnd Bergmann 2016-09-23 18:06:12 +02:00 committed by Eric W. Biederman
parent 213b067ce3
commit 2ed6afdee7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/core/net_namespace.c
View File

@ -266,16 +266,6 @@ struct net *get_net_ns_by_id(struct net *net, int id)
return peer;
}
static struct ucounts *inc_net_namespaces(struct user_namespace *ns)
{
return inc_ucount(ns, current_euid(), UCOUNT_NET_NAMESPACES);
}
static void dec_net_namespaces(struct ucounts *ucounts)
{
dec_ucount(ucounts, UCOUNT_NET_NAMESPACES);
}
/*
* setup_net runs the initializers for the network namespace object.
*/
@ -320,6 +310,16 @@ out_undo:
#ifdef CONFIG_NET_NS
static struct ucounts *inc_net_namespaces(struct user_namespace *ns)
{
return inc_ucount(ns, current_euid(), UCOUNT_NET_NAMESPACES);
}
static void dec_net_namespaces(struct ucounts *ucounts)
{
dec_ucount(ucounts, UCOUNT_NET_NAMESPACES);
}
static struct kmem_cache *net_cachep;
static struct workqueue_struct *netns_wq;