[PATCH] sysctl: remove unused "context" param

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: David Howells <dhowells@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

7 files changed, 16 insertions, 30 deletions

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 0b9d4c955154..fc6f3c023a54 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -167,8 +167,7 @@ static int dn_forwarding_proc(ctl_table *, int, struct file *,
                         void __user *, size_t *, loff_t *);
 static int dn_forwarding_sysctl(ctl_table *table, int __user *name, int nlen,
                         void __user *oldval, size_t __user *oldlenp,
-                        void __user *newval, size_t newlen,
-                        void **context);
+                        void __user *newval, size_t newlen);
 
 static struct dn_dev_sysctl_table {
         struct ctl_table_header *sysctl_header;
@@ -347,8 +346,7 @@ static int dn_forwarding_proc(ctl_table *table, int write,
 
 static int dn_forwarding_sysctl(ctl_table *table, int __user *name, int nlen,
                         void __user *oldval, size_t __user *oldlenp,
-                        void __user *newval, size_t newlen,
-                        void **context)
+                        void __user *newval, size_t newlen)
 {
 #ifdef CONFIG_DECNET_ROUTER
         struct net_device *dev = table->extra1;
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index e246f054f368..a4065eb1341e 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -134,8 +134,7 @@ static int parse_addr(__le16 *addr, char *str)
 
 static int dn_node_address_strategy(ctl_table *table, int __user *name, int nlen,
                                 void __user *oldval, size_t __user *oldlenp,
-                                void __user *newval, size_t newlen,
-                                void **context)
+                                void __user *newval, size_t newlen)
 {
         size_t len;
         __le16 addr;
@@ -220,8 +219,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
 
 static int dn_def_dev_strategy(ctl_table *table, int __user *name, int nlen,
                                 void __user *oldval, size_t __user *oldlenp,
-                                void __user *newval, size_t newlen,
-                                void **context)
+                                void __user *newval, size_t newlen)
 {
         size_t len;
         struct net_device *dev;
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 2fd899160f85..84bed40273ad 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1303,8 +1303,7 @@ int ipv4_doint_and_flush(ctl_table *ctl, int write,
 
 int ipv4_doint_and_flush_strategy(ctl_table *table, int __user *name, int nlen,
                                   void __user *oldval, size_t __user *oldlenp,
-                                  void __user *newval, size_t newlen, 
-                                  void **context)
+                                  void __user *newval, size_t newlen)
 {
         int *valp = table->data;
         int new;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 11c167118e87..1aaff0a2e098 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2872,8 +2872,7 @@ static int ipv4_sysctl_rtcache_flush_strategy(ctl_table *table,
                                                 void __user *oldval,
                                                 size_t __user *oldlenp,
                                                 void __user *newval,
-                                                size_t newlen,
-                                                void **context)
+                                                size_t newlen)
 {
         int delay;
         if (newlen != sizeof(int))
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index dfcf47f10f88..fabf69a9108c 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -51,8 +51,7 @@ int ipv4_sysctl_forward(ctl_table *ctl, int write, struct file * filp,
 static int ipv4_sysctl_forward_strategy(ctl_table *table,
                          int __user *name, int nlen,
                          void __user *oldval, size_t __user *oldlenp,
-                         void __user *newval, size_t newlen, 
-                         void **context)
+                         void __user *newval, size_t newlen)
 {
         int *valp = table->data;
         int new;
@@ -111,8 +110,7 @@ static int proc_tcp_congestion_control(ctl_table *ctl, int write, struct file *
 static int sysctl_tcp_congestion_control(ctl_table *table, int __user *name,
                                          int nlen, void __user *oldval,
                                          size_t __user *oldlenp,
-                                         void __user *newval, size_t newlen,
-                                         void **context)
+                                         void __user *newval, size_t newlen)
 {
         char val[TCP_CA_NAME_MAX];
         ctl_table tbl = {
@@ -122,8 +120,7 @@ static int sysctl_tcp_congestion_control(ctl_table *table, int __user *name,
         int ret;
 
         tcp_get_default_congestion_control(val);
-        ret = sysctl_string(&tbl, name, nlen, oldval, oldlenp, newval, newlen,
-                            context);
+        ret = sysctl_string(&tbl, name, nlen, oldval, oldlenp, newval, newlen);
         if (ret == 0 && newval && newlen)
                 ret = tcp_set_default_congestion_control(val);
         return ret;
@@ -169,8 +166,8 @@ static int proc_allowed_congestion_control(ctl_table *ctl,
 static int strategy_allowed_congestion_control(ctl_table *table, int __user *name,
                                                int nlen, void __user *oldval,
                                                size_t __user *oldlenp,
-                                               void __user *newval, size_t newlen,
-                                               void **context)
+                                               void __user *newval,
+                                               size_t newlen)
 {
         ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
         int ret;
@@ -180,8 +177,7 @@ static int strategy_allowed_congestion_control(ctl_table *table, int __user *nam
                 return -ENOMEM;
 
         tcp_get_available_congestion_control(tbl.data, tbl.maxlen);
-        ret = sysctl_string(&tbl, name, nlen, oldval, oldlenp, newval, newlen,
-                            context);
+        ret = sysctl_string(&tbl, name, nlen, oldval, oldlenp, newval, newlen);
         if (ret == 0 && newval && newlen)
                 ret = tcp_set_allowed_congestion_control(tbl.data);
         kfree(tbl.data);
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index a5e8d207a51b..9b0a90643151 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3656,8 +3656,7 @@ static int addrconf_sysctl_forward_strategy(ctl_table *table,
                                             int __user *name, int nlen,
                                             void __user *oldval,
                                             size_t __user *oldlenp,
-                                            void __user *newval, size_t newlen,
-                                            void **context)
+                                            void __user *newval, size_t newlen)
 {
         int *valp = table->data;
         int new;
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 56ea92837307..6a9f616de37d 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1667,8 +1667,7 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, struct file * f
 static int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name,
                                         int nlen, void __user *oldval,
                                         size_t __user *oldlenp,
-                                        void __user *newval, size_t newlen,
-                                        void **context)
+                                        void __user *newval, size_t newlen)
 {
         struct net_device *dev = ctl->extra1;
         struct inet6_dev *idev;
@@ -1681,14 +1680,12 @@ static int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name,
         switch (ctl->ctl_name) {
         case NET_NEIGH_REACHABLE_TIME:
                 ret = sysctl_jiffies(ctl, name, nlen,
-                                     oldval, oldlenp, newval, newlen,
-                                     context);
+                                     oldval, oldlenp, newval, newlen);
                 break;
         case NET_NEIGH_RETRANS_TIME_MS:
         case NET_NEIGH_REACHABLE_TIME_MS:
                  ret = sysctl_ms_jiffies(ctl, name, nlen,
-                                         oldval, oldlenp, newval, newlen,
-                                         context);
+                                         oldval, oldlenp, newval, newlen);
                  break;
         default:
                 ret = 0;