diff options
author | Pavel Emelyanov <xemul@parallels.com> | 2012-04-18 23:39:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-21 15:52:25 -0400 |
commit | 4a17fd5229c1b6066aa478f6b690f8293ce811a1 (patch) | |
tree | f6acd00935d2d7a990befb4c77f57fdf39f46689 /drivers/block | |
parent | 59c55bdde856c4000bbeb33ba212c3df6f1997a4 (diff) |
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>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 43beaca53179..436f519bed1c 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -664,7 +664,7 @@ static struct socket *drbd_wait_for_connect(struct drbd_conf *mdev) | |||
664 | timeo = mdev->net_conf->try_connect_int * HZ; | 664 | timeo = mdev->net_conf->try_connect_int * HZ; |
665 | timeo += (random32() & 1) ? timeo / 7 : -timeo / 7; /* 28.5% random jitter */ | 665 | timeo += (random32() & 1) ? timeo / 7 : -timeo / 7; /* 28.5% random jitter */ |
666 | 666 | ||
667 | s_listen->sk->sk_reuse = 1; /* SO_REUSEADDR */ | 667 | s_listen->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */ |
668 | s_listen->sk->sk_rcvtimeo = timeo; | 668 | s_listen->sk->sk_rcvtimeo = timeo; |
669 | s_listen->sk->sk_sndtimeo = timeo; | 669 | s_listen->sk->sk_sndtimeo = timeo; |
670 | drbd_setbufsize(s_listen, mdev->net_conf->sndbuf_size, | 670 | drbd_setbufsize(s_listen, mdev->net_conf->sndbuf_size, |
@@ -841,8 +841,8 @@ retry: | |||
841 | } | 841 | } |
842 | } while (1); | 842 | } while (1); |
843 | 843 | ||
844 | msock->sk->sk_reuse = 1; /* SO_REUSEADDR */ | 844 | msock->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */ |
845 | sock->sk->sk_reuse = 1; /* SO_REUSEADDR */ | 845 | sock->sk->sk_reuse = SK_CAN_REUSE; /* SO_REUSEADDR */ |
846 | 846 | ||
847 | sock->sk->sk_allocation = GFP_NOIO; | 847 | sock->sk->sk_allocation = GFP_NOIO; |
848 | msock->sk->sk_allocation = GFP_NOIO; | 848 | msock->sk->sk_allocation = GFP_NOIO; |