sock: Introduce named constants for sk_reuse

Name them in a "backward compatible" manner, i.e. reuse or not
are still 1 and 0 respectively. The reuse value of 2 means that
the socket with it will forcibly reuse everyone else's port.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 11 insertions, 8 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index c7e60eac639b..679c5bbe2bed 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -561,7 +561,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
                         sock_valbool_flag(sk, SOCK_DBG, valbool);
                 break;
         case SO_REUSEADDR:
-                sk->sk_reuse = valbool;
+                sk->sk_reuse = (valbool ? SK_CAN_REUSE : SK_NO_REUSE);
                 break;
         case SO_TYPE:
         case SO_PROTOCOL:
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 71b5edcee401..fa14ca76b77b 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -617,7 +617,7 @@ static int econet_create(struct net *net, struct socket *sock, int protocol,
         if (sk == NULL)
                 goto out;
 
-        sk->sk_reuse = 1;
+        sk->sk_reuse = SK_CAN_REUSE;
         sock->ops = &econet_ops;
         sock_init_data(sock, sk);
 
@@ -1012,7 +1012,7 @@ static int __init aun_udp_initialise(void)
                 return error;
         }
 
-        udpsock->sk->sk_reuse = 1;
+        udpsock->sk->sk_reuse = SK_CAN_REUSE;
         udpsock->sk->sk_allocation = GFP_ATOMIC; /* we're going to call it
                                                     from interrupts */
 
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 3744c1c0af5a..c8f7aee587d1 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -350,7 +350,7 @@ lookup_protocol:
         err = 0;
         sk->sk_no_check = answer_no_check;
         if (INET_PROTOSW_REUSE & answer_flags)
-                sk->sk_reuse = 1;
+                sk->sk_reuse = SK_CAN_REUSE;
 
         inet = inet_sk(sk);
         inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) != 0;
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 7d972f650a61..95e61596e605 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -182,6 +182,9 @@ have_snum:
         goto tb_not_found;
 tb_found:
         if (!hlist_empty(&tb->owners)) {
+                if (sk->sk_reuse == SK_FORCE_REUSE)
+                        goto success;
+
                 if (tb->fastreuse > 0 &&
                     sk->sk_reuse && sk->sk_state != TCP_LISTEN &&
                     smallest_size == -1) {
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 461e7896e5d8..0ad046c7ae95 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -180,7 +180,7 @@ lookup_protocol:
         err = 0;
         sk->sk_no_check = answer_no_check;
         if (INET_PROTOSW_REUSE & answer_flags)
-                sk->sk_reuse = 1;
+                sk->sk_reuse = SK_CAN_REUSE;
 
         inet = inet_sk(sk);
         inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) != 0;
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index f4e0b6cf8246..bf5e538af67b 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1368,7 +1368,7 @@ static struct socket *make_receive_sock(struct net *net)
          */
         sk_change_net(sock->sk, net);
         /* it is equivalent to the REUSEADDR option in user-space */
-        sock->sk->sk_reuse = 1;
+        sock->sk->sk_reuse = SK_CAN_REUSE;
 
         result = sock->ops->bind(sock, (struct sockaddr *) &mcast_addr,
                         sizeof(struct sockaddr));
diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index 8b5cc4aa8868..72981375f47c 100644
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -145,7 +145,7 @@ int rds_tcp_listen_init(void)
         if (ret < 0)
                 goto out;
 
-        sock->sk->sk_reuse = 1;
+        sock->sk->sk_reuse = SK_CAN_REUSE;
         rds_tcp_nonagle(sock);
 
         write_lock_bh(&sock->sk->sk_callback_lock);
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 824d32fb3121..f0132b2e875e 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1556,7 +1556,7 @@ static struct svc_xprt *svc_create_socket(struct svc_serv *serv,
                                         (char *)&val, sizeof(val));
 
         if (type == SOCK_STREAM)
-                sock->sk->sk_reuse = 1;         /* allow address reuse */
+                sock->sk->sk_reuse = SK_CAN_REUSE; /* allow address reuse */
         error = kernel_bind(sock, sin, len);
         if (error < 0)
                 goto bummer;