net: inline function get_net_ns_by_fd if NET_NS is disabled
Subsystems (3)
PATCH v2 1/1 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 Changbin Du <[email protected]>
---
v2: rebase to net-tree.
--- include/net/net_namespace.h | 7 ++++++- net/core/net_namespace.c | 8 +------- 2 files changed, 7 insertions(+), 8 deletions(-)
include/net/net_namespace.h +6 -1
@@ -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
@@ -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) {
Signature · 1 line
2.30.2
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Tue, 15 Jun 2021 07:52:43 +0800 you wrote:
The function
get_net_ns_by_fd()could be inlined whenNET_NSis not enabled.Signed-off-by Changbin Du <[email protected]>---
v2: rebase to net-tree.[...]
Here is the summary with links:
- [v2] net: inline function get_net_ns_by_fd if NET_NS is disabled
https://git.kernel.org/netdev/net/c/e34492dea68d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html