[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

Introduce per-sock inlines: sock_net(), sock_net_set()
and per-inet_timewait_sock inlines: twsk_net(), twsk_net_set().
Without CONFIG_NET_NS, no namespace other than &init_net exists.
Let's explicitly define them to help compiler optimizations.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/socket.c b/net/socket.c
index 9d3fbfbc8535..79e5382fd110 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -857,7 +857,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 
         sock = file->private_data;
         sk = sock->sk;
-        net = sk->sk_net;
+        net = sock_net(sk);
         if (cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) {
                 err = dev_ioctl(net, cmd, argp);
         } else
@@ -1375,7 +1375,7 @@ asmlinkage long sys_listen(int fd, int backlog)
 
         sock = sockfd_lookup_light(fd, &err, &fput_needed);
         if (sock) {
-                somaxconn = sock->sk->sk_net->sysctl_somaxconn;
+                somaxconn = sock_net(sock->sk)->sysctl_somaxconn;
                 if ((unsigned)backlog > somaxconn)
                         backlog = somaxconn;