summaryrefslogtreecommitdiffstats
path: root/net/core/net_namespace.c
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2015-05-07 11:02:49 +0200
committerDavid S. Miller <davem@davemloft.net>2015-05-09 22:15:30 -0400
commit7a0877d4b438886b72be61632eaa774d13262f70 (patch)
treeb8cb00423af5be00667a07302128f0fe7c4f66a0 /net/core/net_namespace.c
parentcab3c8ec8d57ef48ed754ee7acf2b9bdce80fa5f (diff)
downloadlinux-7a0877d4b438886b72be61632eaa774d13262f70.tar.gz
linux-7a0877d4b438886b72be61632eaa774d13262f70.tar.bz2
linux-7a0877d4b438886b72be61632eaa774d13262f70.zip
netns: rename peernet2id() to peernet2id_alloc()
In a following commit, a new function will be introduced to only lookup for a nsid (no allocation if the nsid doesn't exist). To avoid confusion, the existing function is renamed. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/net_namespace.c')
-rw-r--r--net/core/net_namespace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 37c68bb72db3..9c806ac569f9 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -202,13 +202,13 @@ static int __peernet2id(struct net *net, struct net *peer, bool alloc)
/* This function returns the id of a peer netns. If no id is assigned, one will
* be allocated and returned.
*/
-int peernet2id(struct net *net, struct net *peer)
+int peernet2id_alloc(struct net *net, struct net *peer)
{
bool alloc = atomic_read(&peer->count) == 0 ? false : true;
return __peernet2id(net, peer, alloc);
}
-EXPORT_SYMBOL(peernet2id);
+EXPORT_SYMBOL(peernet2id_alloc);
struct net *get_net_ns_by_id(struct net *net, int id)
{