[IPVS]: Fix sysctl warnings about missing strategy
Running the latest git code I get the following messages during boot: sysctl table check failed: /net/ipv4/vs/drop_entry .3.5.21.4 Missing strategy [...] sysctl table check failed: /net/ipv4/vs/drop_packet .3.5.21.5 Missing strategy [...] sysctl table check failed: /net/ipv4/vs/secure_tcp .3.5.21.6 Missing strategy [...] sysctl table check failed: /net/ipv4/vs/sync_threshold .3.5.21.24 Missing strategy I removed the binary sysctl handler for those messages and also removed the definitions in ip_vs.h. The alternative would be to implement a proper strategy handler, but syscall sysctl is deprecated. There are other sysctl definitions that are commented out or work with the default sysctl_data strategy. I did not touch these. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Acked-by: Simon Horman <horms@verge.net.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
21df56c6e2
commit
611cd55b15
|
@ -336,9 +336,6 @@ enum {
|
||||||
NET_IPV4_VS_DEBUG_LEVEL=1,
|
NET_IPV4_VS_DEBUG_LEVEL=1,
|
||||||
NET_IPV4_VS_AMEMTHRESH=2,
|
NET_IPV4_VS_AMEMTHRESH=2,
|
||||||
NET_IPV4_VS_AMDROPRATE=3,
|
NET_IPV4_VS_AMDROPRATE=3,
|
||||||
NET_IPV4_VS_DROP_ENTRY=4,
|
|
||||||
NET_IPV4_VS_DROP_PACKET=5,
|
|
||||||
NET_IPV4_VS_SECURE_TCP=6,
|
|
||||||
NET_IPV4_VS_TO_ES=7,
|
NET_IPV4_VS_TO_ES=7,
|
||||||
NET_IPV4_VS_TO_SS=8,
|
NET_IPV4_VS_TO_SS=8,
|
||||||
NET_IPV4_VS_TO_SR=9,
|
NET_IPV4_VS_TO_SR=9,
|
||||||
|
@ -355,7 +352,6 @@ enum {
|
||||||
NET_IPV4_VS_LBLCR_EXPIRE=20,
|
NET_IPV4_VS_LBLCR_EXPIRE=20,
|
||||||
NET_IPV4_VS_CACHE_BYPASS=22,
|
NET_IPV4_VS_CACHE_BYPASS=22,
|
||||||
NET_IPV4_VS_EXPIRE_NODEST_CONN=23,
|
NET_IPV4_VS_EXPIRE_NODEST_CONN=23,
|
||||||
NET_IPV4_VS_SYNC_THRESHOLD=24,
|
|
||||||
NET_IPV4_VS_NAT_ICMP_SEND=25,
|
NET_IPV4_VS_NAT_ICMP_SEND=25,
|
||||||
NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE=26,
|
NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE=26,
|
||||||
NET_IPV4_VS_LAST
|
NET_IPV4_VS_LAST
|
||||||
|
|
|
@ -242,9 +242,6 @@ static struct trans_ctl_table trans_net_ipv4_vs_table[] = {
|
||||||
{ NET_IPV4_VS_AMEMTHRESH, "amemthresh" },
|
{ NET_IPV4_VS_AMEMTHRESH, "amemthresh" },
|
||||||
{ NET_IPV4_VS_DEBUG_LEVEL, "debug_level" },
|
{ NET_IPV4_VS_DEBUG_LEVEL, "debug_level" },
|
||||||
{ NET_IPV4_VS_AMDROPRATE, "am_droprate" },
|
{ NET_IPV4_VS_AMDROPRATE, "am_droprate" },
|
||||||
{ NET_IPV4_VS_DROP_ENTRY, "drop_entry" },
|
|
||||||
{ NET_IPV4_VS_DROP_PACKET, "drop_packet" },
|
|
||||||
{ NET_IPV4_VS_SECURE_TCP, "secure_tcp" },
|
|
||||||
{ NET_IPV4_VS_TO_ES, "timeout_established" },
|
{ NET_IPV4_VS_TO_ES, "timeout_established" },
|
||||||
{ NET_IPV4_VS_TO_SS, "timeout_synsent" },
|
{ NET_IPV4_VS_TO_SS, "timeout_synsent" },
|
||||||
{ NET_IPV4_VS_TO_SR, "timeout_synrecv" },
|
{ NET_IPV4_VS_TO_SR, "timeout_synrecv" },
|
||||||
|
@ -260,7 +257,6 @@ static struct trans_ctl_table trans_net_ipv4_vs_table[] = {
|
||||||
{ NET_IPV4_VS_CACHE_BYPASS, "cache_bypass" },
|
{ NET_IPV4_VS_CACHE_BYPASS, "cache_bypass" },
|
||||||
{ NET_IPV4_VS_EXPIRE_NODEST_CONN, "expire_nodest_conn" },
|
{ NET_IPV4_VS_EXPIRE_NODEST_CONN, "expire_nodest_conn" },
|
||||||
{ NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE, "expire_quiescent_template" },
|
{ NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE, "expire_quiescent_template" },
|
||||||
{ NET_IPV4_VS_SYNC_THRESHOLD, "sync_threshold" },
|
|
||||||
{ NET_IPV4_VS_NAT_ICMP_SEND, "nat_icmp_send" },
|
{ NET_IPV4_VS_NAT_ICMP_SEND, "nat_icmp_send" },
|
||||||
{ NET_IPV4_VS_LBLC_EXPIRE, "lblc_expiration" },
|
{ NET_IPV4_VS_LBLC_EXPIRE, "lblc_expiration" },
|
||||||
{ NET_IPV4_VS_LBLCR_EXPIRE, "lblcr_expiration" },
|
{ NET_IPV4_VS_LBLCR_EXPIRE, "lblcr_expiration" },
|
||||||
|
|
|
@ -1450,7 +1450,6 @@ static struct ctl_table vs_vars[] = {
|
||||||
.proc_handler = &proc_dointvec,
|
.proc_handler = &proc_dointvec,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.ctl_name = NET_IPV4_VS_DROP_ENTRY,
|
|
||||||
.procname = "drop_entry",
|
.procname = "drop_entry",
|
||||||
.data = &sysctl_ip_vs_drop_entry,
|
.data = &sysctl_ip_vs_drop_entry,
|
||||||
.maxlen = sizeof(int),
|
.maxlen = sizeof(int),
|
||||||
|
@ -1458,7 +1457,6 @@ static struct ctl_table vs_vars[] = {
|
||||||
.proc_handler = &proc_do_defense_mode,
|
.proc_handler = &proc_do_defense_mode,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.ctl_name = NET_IPV4_VS_DROP_PACKET,
|
|
||||||
.procname = "drop_packet",
|
.procname = "drop_packet",
|
||||||
.data = &sysctl_ip_vs_drop_packet,
|
.data = &sysctl_ip_vs_drop_packet,
|
||||||
.maxlen = sizeof(int),
|
.maxlen = sizeof(int),
|
||||||
|
@ -1466,7 +1464,6 @@ static struct ctl_table vs_vars[] = {
|
||||||
.proc_handler = &proc_do_defense_mode,
|
.proc_handler = &proc_do_defense_mode,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.ctl_name = NET_IPV4_VS_SECURE_TCP,
|
|
||||||
.procname = "secure_tcp",
|
.procname = "secure_tcp",
|
||||||
.data = &sysctl_ip_vs_secure_tcp,
|
.data = &sysctl_ip_vs_secure_tcp,
|
||||||
.maxlen = sizeof(int),
|
.maxlen = sizeof(int),
|
||||||
|
@ -1596,7 +1593,6 @@ static struct ctl_table vs_vars[] = {
|
||||||
.proc_handler = &proc_dointvec,
|
.proc_handler = &proc_dointvec,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.ctl_name = NET_IPV4_VS_SYNC_THRESHOLD,
|
|
||||||
.procname = "sync_threshold",
|
.procname = "sync_threshold",
|
||||||
.data = &sysctl_ip_vs_sync_threshold,
|
.data = &sysctl_ip_vs_sync_threshold,
|
||||||
.maxlen = sizeof(sysctl_ip_vs_sync_threshold),
|
.maxlen = sizeof(sysctl_ip_vs_sync_threshold),
|
||||||
|
|
Loading…
Reference in New Issue