diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-06 23:48:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-07 04:11:42 -0800 |
| commit | df61c952622f51facac21dd8dfa4d8a24dcb9657 (patch) | |
| tree | a65bbebca1467a5168332b906edcc0f9ae8808f5 | |
| parent | c3e9a353d8fc64a82ab11a07e21902e25e1e96d1 (diff) | |
| download | blackbird-op-linux-df61c952622f51facac21dd8dfa4d8a24dcb9657.tar.gz blackbird-op-linux-df61c952622f51facac21dd8dfa4d8a24dcb9657.zip | |
[DLM] lowcomms: Do not muck with sysctl_rmem_max.
Use SO_RCVBUFFORCE instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | fs/dlm/lowcomms.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 58bf3f5cdbe2..e9923ca9c2d9 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -1062,7 +1062,7 @@ static int sctp_listen_for_all(void) subscribe.sctp_shutdown_event = 1; subscribe.sctp_partial_delivery_event = 1; - result = kernel_setsockopt(sock, SOL_SOCKET, SO_RCVBUF, + result = kernel_setsockopt(sock, SOL_SOCKET, SO_RCVBUFFORCE, (char *)&bufsize, sizeof(bufsize)); if (result) log_print("Error increasing buffer space on socket %d", result); @@ -1454,10 +1454,6 @@ int dlm_lowcomms_start(void) if (!con_cache) goto out; - /* Set some sysctl minima */ - if (sysctl_rmem_max < NEEDED_RMEM) - sysctl_rmem_max = NEEDED_RMEM; - /* Start listening */ if (dlm_config.ci_protocol == 0) error = tcp_listen_for_all(); |
