diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-12-08 00:12:33 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:56:57 -0800 |
commit | b8e1f9b5c37e77cc8f978a58859b35fe5edd5542 (patch) | |
tree | 3c39da61f10eeb8b8e200ec68770128f1b57f25d /net/socket.c | |
parent | 790a35328991b01181ff5624bdb084053b6fac54 (diff) | |
download | blackbird-op-linux-b8e1f9b5c37e77cc8f978a58859b35fe5edd5542.tar.gz blackbird-op-linux-b8e1f9b5c37e77cc8f978a58859b35fe5edd5542.zip |
[NET] sysctl: make sysctl_somaxconn per-namespace
Just move the variable on the struct net and adjust
its usage.
Others sysctls from sys.net.core table are more
difficult to virtualize (i.e. make them per-namespace),
but I'll look at them as well a bit later.
Signed-off-by: Pavel Emelyanov <xemul@oenvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket.c b/net/socket.c index 9ebca5c695d6..7651de008502 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1365,17 +1365,17 @@ asmlinkage long sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen) * ready for listening. */ -int sysctl_somaxconn __read_mostly = SOMAXCONN; - asmlinkage long sys_listen(int fd, int backlog) { struct socket *sock; int err, fput_needed; + int somaxconn; sock = sockfd_lookup_light(fd, &err, &fput_needed); if (sock) { - if ((unsigned)backlog > sysctl_somaxconn) - backlog = sysctl_somaxconn; + somaxconn = sock->sk->sk_net->sysctl_somaxconn; + if ((unsigned)backlog > somaxconn) + backlog = somaxconn; err = security_socket_listen(sock, backlog); if (!err) |