[Devel] [PATCH RHEL7 COMMIT] ve/sysctl: remove unused fs.ve-area-access-check, net.ipv4.tcp_max_tw*

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-327.18.2.vz7.14.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.18.2.vz7.14.15
------>
commit eda1f7c1b63c7ede41f0f85e62012698e307d757
Author: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
Date:   Thu Jun 16 12:27:38 2016 +0400

    ve/sysctl: remove unused fs.ve-area-access-check, net.ipv4.tcp_max_tw*
    
    After patch "bc: Rip old network buffers and sockets accounting" which
    is merged into commit 054db2512a17 ("Initial patch commit + compilation
    fixes") we do not use sysctl_tcp_max_tw_buckets_ub and
    sysctl_tcp_max_tw_kmem_fraction.
    
    We do not have check_area_access_ve the only place where
    ve_area_access_check have been used so we do not need a sysctl.
    
    https://jira.sw.ru/browse/PSBM-47061
    
    Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 include/net/tcp.h          |  2 --
 kernel/ve/veowner.c        |  8 --------
 net/ipv4/sysctl_net_ipv4.c | 14 --------------
 net/ipv4/tcp_minisocks.c   |  5 -----
 4 files changed, 29 deletions(-)

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 58bc5a9..fd95c75 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -289,8 +289,6 @@ extern int sysctl_tcp_min_tso_segs;
 extern int sysctl_tcp_autocorking;
 extern int sysctl_tcp_invalid_ratelimit;
 extern int sysctl_tcp_use_sg;
-extern int sysctl_tcp_max_tw_kmem_fraction;
-extern int sysctl_tcp_max_tw_buckets_ub;
 
 extern atomic_long_t tcp_memory_allocated;
 extern struct percpu_counter tcp_sockets_allocated;
diff --git a/kernel/ve/veowner.c b/kernel/ve/veowner.c
index efce5f2..8606507 100644
--- a/kernel/ve/veowner.c
+++ b/kernel/ve/veowner.c
@@ -50,7 +50,6 @@ static void prepare_proc(void)
  * OpenVZ sysctl
  * ------------------------------------------------------------------------
  */
-static int ve_area_access_check;
 
 /*
  * Operations with a big amount of mount points can require a lot of time.
@@ -62,13 +61,6 @@ unsigned int sysctl_ve_mount_nr = 4096;
 
 static struct ctl_table vz_fs_table[] = {
 	{
-		.procname	= "ve-area-access-check",
-		.data		= &ve_area_access_check,
-		.maxlen		= sizeof(int),
-		.mode		= 0644,
-		.proc_handler	= proc_dointvec,
-	},
-	{
 		.procname	= "fsync-enable",
 		.data		= &ve0.fsync_enable,
 		.maxlen		= sizeof(int),
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index a44b231..21fe887 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -814,20 +814,6 @@ static struct ctl_table ipv4_table[] = {
 		.extra1		= &one
 	},
 	{
-		.procname       = "tcp_max_tw_kmem_fraction",
-		.data           = &sysctl_tcp_max_tw_kmem_fraction,
-		.maxlen         = sizeof(int),
-		.mode           = 0644,
-		.proc_handler   = proc_dointvec,
-	},
-	{
-		.procname       = "tcp_max_tw_buckets_ub",
-		.data           = &sysctl_tcp_max_tw_buckets_ub,
-		.maxlen         = sizeof(int),
-		.mode           = 0644,
-		.proc_handler   = proc_dointvec,
-	},
-	{
 		.procname	= "tcp_use_sg",
 		.data		= &sysctl_tcp_use_sg,
 		.maxlen		= sizeof(int),
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 5e2330f..8c7bbf9 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -31,11 +31,6 @@ int sysctl_tcp_syncookies __read_mostly = 1;
 EXPORT_SYMBOL(sysctl_tcp_syncookies);
 
 int sysctl_tcp_abort_on_overflow __read_mostly;
-int sysctl_tcp_max_tw_kmem_fraction __read_mostly = 384;
-int sysctl_tcp_max_tw_buckets_ub __read_mostly = 16536;
-
-EXPORT_SYMBOL(sysctl_tcp_max_tw_kmem_fraction);
-EXPORT_SYMBOL(sysctl_tcp_max_tw_buckets_ub);
 
 struct inet_timewait_death_row tcp_death_row = {
 	.sysctl_max_tw_buckets = NR_FILE * 2,