瀏覽代碼

[DLM] lowcomms: Do not muck with sysctl_rmem_max.

Use SO_RCVBUFFORCE instead.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 17 年之前
父節點
當前提交
df61c95262
共有 1 個文件被更改,包括 1 次插入5 次删除
  1. 1 5
      fs/dlm/lowcomms.c

+ 1 - 5
fs/dlm/lowcomms.c

@@ -1062,7 +1062,7 @@ static int sctp_listen_for_all(void)
 	subscribe.sctp_shutdown_event = 1;
 	subscribe.sctp_shutdown_event = 1;
 	subscribe.sctp_partial_delivery_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));
 				 (char *)&bufsize, sizeof(bufsize));
 	if (result)
 	if (result)
 		log_print("Error increasing buffer space on socket %d", result);
 		log_print("Error increasing buffer space on socket %d", result);
@@ -1454,10 +1454,6 @@ int dlm_lowcomms_start(void)
 	if (!con_cache)
 	if (!con_cache)
 		goto out;
 		goto out;
 
 
-	/* Set some sysctl minima */
-	if (sysctl_rmem_max < NEEDED_RMEM)
-		sysctl_rmem_max = NEEDED_RMEM;
-
 	/* Start listening */
 	/* Start listening */
 	if (dlm_config.ci_protocol == 0)
 	if (dlm_config.ci_protocol == 0)
 		error = tcp_listen_for_all();
 		error = tcp_listen_for_all();