Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a17fd52 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59c55bdd

drivers/block/drbd/drbd_receiver.c

+3 −3
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static struct socket *drbd_wait_for_connect(struct drbd_conf *mdev) 
	timeo = mdev->net_conf->try_connect_int * HZ;

	timeo += (random32() & 1) ? timeo / 7 : -timeo / 7; /* 28.5% random jitter */



	s_listen->sk->sk_reuse    = 1; /* SO_REUSEADDR */

	s_listen->sk->sk_reuse    = SK_CAN_REUSE; /* SO_REUSEADDR */

	s_listen->sk->sk_rcvtimeo = timeo;

	s_listen->sk->sk_sndtimeo = timeo;

	drbd_setbufsize(s_listen, mdev->net_conf->sndbuf_size,
@@ -841,8 +841,8 @@ retry: 
		}

	} while (1);



	msock->sk->sk_reuse = 1; /* SO_REUSEADDR */

	sock->sk->sk_reuse = 1; /* SO_REUSEADDR */

	msock->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */

	sock->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */



	sock->sk->sk_allocation = GFP_NOIO;

	msock->sk->sk_allocation = GFP_NOIO;

drivers/scsi/iscsi_tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ iscsi_sw_tcp_conn_bind(struct iscsi_cls_session *cls_session, 


	/* setup Socket parameters */

	sk = sock->sk;

	sk->sk_reuse = 1;

	sk->sk_reuse = SK_CAN_REUSE;

	sk->sk_sndtimeo = 15 * HZ; /* FIXME: make it configurable */

	sk->sk_allocation = GFP_ATOMIC;

drivers/staging/ramster/cluster/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -2106,7 +2106,7 @@ static int r2net_open_listening_sock(__be32 addr, __be16 port) 
	r2net_listen_sock = sock;

	INIT_WORK(&r2net_listen_work, r2net_accept_many);



	sock->sk->sk_reuse = 1;

	sock->sk->sk_reuse = SK_CAN_REUSE;

	ret = sock->ops->bind(sock, (struct sockaddr *)&sin, sizeof(sin));

	if (ret < 0) {

		printk(KERN_ERR "ramster: Error %d while binding socket at "

fs/ocfs2/cluster/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -2005,7 +2005,7 @@ static int o2net_open_listening_sock(__be32 addr, __be16 port) 
	o2net_listen_sock = sock;

	INIT_WORK(&o2net_listen_work, o2net_accept_many);



	sock->sk->sk_reuse = 1;

	sock->sk->sk_reuse = SK_CAN_REUSE;

	ret = sock->ops->bind(sock, (struct sockaddr *)&sin, sizeof(sin));

	if (ret < 0) {

		printk(KERN_ERR "o2net: Error %d while binding socket at "

include/net/sock.h

+11 −0
Original line number Diff line number Diff line
@@ -376,6 +376,17 @@ struct sock { 
	void                    (*sk_destruct)(struct sock *sk);

};



/*

 * SK_CAN_REUSE and SK_NO_REUSE on a socket mean that the socket is OK

 * or not whether his port will be reused by someone else. SK_FORCE_REUSE

 * on a socket means that the socket will reuse everybody else's port

 * without looking at the other's sk_reuse value.

 */



#define SK_NO_REUSE	0

#define SK_CAN_REUSE	1

#define SK_FORCE_REUSE	2



static inline int sk_peek_offset(struct sock *sk, int flags)

{

	if ((flags & MSG_PEEK) && (sk->sk_peek_off >= 0))