diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-07 02:48:57 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-07 07:11:42 -0500 |
commit | df61c952622f51facac21dd8dfa4d8a24dcb9657 (patch) | |
tree | a65bbebca1467a5168332b906edcc0f9ae8808f5 /fs/dlm/lowcomms.c | |
parent | c3e9a353d8fc64a82ab11a07e21902e25e1e96d1 (diff) |
[DLM] lowcomms: Do not muck with sysctl_rmem_max.
Use SO_RCVBUFFORCE instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/dlm/lowcomms.c')
-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) | |||
1062 | subscribe.sctp_shutdown_event = 1; | 1062 | subscribe.sctp_shutdown_event = 1; |
1063 | subscribe.sctp_partial_delivery_event = 1; | 1063 | subscribe.sctp_partial_delivery_event = 1; |
1064 | 1064 | ||
1065 | result = kernel_setsockopt(sock, SOL_SOCKET, SO_RCVBUF, | 1065 | result = kernel_setsockopt(sock, SOL_SOCKET, SO_RCVBUFFORCE, |
1066 | (char *)&bufsize, sizeof(bufsize)); | 1066 | (char *)&bufsize, sizeof(bufsize)); |
1067 | if (result) | 1067 | if (result) |
1068 | log_print("Error increasing buffer space on socket %d", result); | 1068 | log_print("Error increasing buffer space on socket %d", result); |
@@ -1454,10 +1454,6 @@ int dlm_lowcomms_start(void) | |||
1454 | if (!con_cache) | 1454 | if (!con_cache) |
1455 | goto out; | 1455 | goto out; |
1456 | 1456 | ||
1457 | /* Set some sysctl minima */ | ||
1458 | if (sysctl_rmem_max < NEEDED_RMEM) | ||
1459 | sysctl_rmem_max = NEEDED_RMEM; | ||
1460 | |||
1461 | /* Start listening */ | 1457 | /* Start listening */ |
1462 | if (dlm_config.ci_protocol == 0) | 1458 | if (dlm_config.ci_protocol == 0) |
1463 | error = tcp_listen_for_all(); | 1459 | error = tcp_listen_for_all(); |