Commit e34492de authored by Changbin Du's avatar Changbin Du Committed by David S. Miller
Browse files

net: inline function get_net_ns_by_fd if NET_NS is disabled 



The function get_net_ns_by_fd() could be inlined when NET_NS is not
enabled.

Signed-off-by: default avatarChangbin Du <changbin.du@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 475b92f9

include/net/net_namespace.h

+6 −1
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ void net_ns_get_ownership(const struct net *net, kuid_t *uid, kgid_t *gid); 
void net_ns_barrier(void);



struct ns_common *get_net_ns(struct ns_common *ns);

struct net *get_net_ns_by_fd(int fd);

#else /* CONFIG_NET_NS */

#include <linux/sched.h>

#include <linux/nsproxy.h>
@@ -210,13 +211,17 @@ static inline struct ns_common *get_net_ns(struct ns_common *ns) 
{

	return ERR_PTR(-EINVAL);

}



static inline struct net *get_net_ns_by_fd(int fd)

{

	return ERR_PTR(-EINVAL);

}

#endif /* CONFIG_NET_NS */





extern struct list_head net_namespace_list;



struct net *get_net_ns_by_pid(pid_t pid);

struct net *get_net_ns_by_fd(int fd);



#ifdef CONFIG_SYSCTL

void ipx_register_sysctl(void);

net/core/net_namespace.c

+1 −7
Original line number Diff line number Diff line
@@ -672,14 +672,8 @@ struct net *get_net_ns_by_fd(int fd) 
	fput(file);

	return net;

}



#else

struct net *get_net_ns_by_fd(int fd)

{

	return ERR_PTR(-EINVAL);

}

#endif

EXPORT_SYMBOL_GPL(get_net_ns_by_fd);

#endif



struct net *get_net_ns_by_pid(pid_t pid)

{