sysctl: remove "struct file *" argument of ->proc_handler

[safe/jmp/linux-2.6] / net / decnet / sysctl_net_decnet.c

diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index e246f05..26b0ab1 100644 (file)
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -126,16 +126,15 @@ static int parse_addr(__le16 *addr, char *str)
        if (INVALID_END_CHAR(*str))
                return -1;
 
-       *addr = dn_htons((area << 10) | node);
+       *addr = cpu_to_le16((area << 10) | node);
 
        return 0;
 }
 
 
-static int dn_node_address_strategy(ctl_table *table, int __user *name, int nlen,
+static int dn_node_address_strategy(ctl_table *table,
                                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;
@@ -165,8 +164,7 @@ static int dn_node_address_strategy(ctl_table *table, int __user *name, int nlen
        return 0;
 }
 
-static int dn_node_address_handler(ctl_table *table, int write, 
-                               struct file *filp,
+static int dn_node_address_handler(ctl_table *table, int write,
                                void __user *buffer,
                                size_t *lenp, loff_t *ppos)
 {
@@ -180,7 +178,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
        }
 
        if (write) {
-               int len = (*lenp < DN_ASCBUF_LEN) ? *lenp : (DN_ASCBUF_LEN-1);
+               len = (*lenp < DN_ASCBUF_LEN) ? *lenp : (DN_ASCBUF_LEN-1);
 
                if (copy_from_user(addr, buffer, len))
                        return -EFAULT;
@@ -202,7 +200,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
                return 0;
        }
 
-       dn_addr2asc(dn_ntohs(decnet_address), addr);
+       dn_addr2asc(le16_to_cpu(decnet_address), addr);
        len = strlen(addr);
        addr[len++] = '\n';
 
@@ -218,10 +216,9 @@ 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,
+static int dn_def_dev_strategy(ctl_table *table,
                                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;
@@ -242,7 +239,7 @@ static int dn_def_dev_strategy(ctl_table *table, int __user *name, int nlen,
                        }
 
                        namel = strlen(devname) + 1;
-                       if (len > namel) len = namel;   
+                       if (len > namel) len = namel;
 
                        if (copy_to_user(oldval, devname, len))
                                return -EFAULT;
@@ -261,7 +258,7 @@ static int dn_def_dev_strategy(ctl_table *table, int __user *name, int nlen,
 
                devname[newlen] = 0;
 
-               dev = dev_get_by_name(devname);
+               dev = dev_get_by_name(&init_net, devname);
                if (dev == NULL)
                        return -ENODEV;
 
@@ -277,8 +274,7 @@ static int dn_def_dev_strategy(ctl_table *table, int __user *name, int nlen,
 }
 
 
-static int dn_def_dev_handler(ctl_table *table, int write, 
-                               struct file * filp,
+static int dn_def_dev_handler(ctl_table *table, int write,
                                void __user *buffer,
                                size_t *lenp, loff_t *ppos)
 {
@@ -301,7 +297,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
                devname[*lenp] = 0;
                strip_it(devname);
 
-               dev = dev_get_by_name(devname);
+               dev = dev_get_by_name(&init_net, devname);
                if (dev == NULL)
                        return -ENODEV;
 
@@ -343,26 +339,26 @@ static int dn_def_dev_handler(ctl_table *table, int write,
 
 static ctl_table dn_table[] = {
        {
-               .ctl_name = NET_DECNET_NODE_ADDRESS, 
-               .procname = "node_address", 
-               .maxlen = 7, 
-               .mode = 0644, 
+               .ctl_name = NET_DECNET_NODE_ADDRESS,
+               .procname = "node_address",
+               .maxlen = 7,
+               .mode = 0644,
                .proc_handler = dn_node_address_handler,
                .strategy = dn_node_address_strategy,
        },
        {
                .ctl_name = NET_DECNET_NODE_NAME,
                .procname = "node_name",
-               .data = node_name, 
+               .data = node_name,
                .maxlen = 7,
                .mode = 0644,
-               .proc_handler = &proc_dostring,
-               .strategy = &sysctl_string,
+               .proc_handler = proc_dostring,
+               .strategy = sysctl_string,
        },
        {
                .ctl_name = NET_DECNET_DEFAULT_DEVICE,
-               .procname = "default_device", 
-               .maxlen = 16, 
+               .procname = "default_device",
+               .maxlen = 16,
                .mode = 0644,
                .proc_handler = dn_def_dev_handler,
                .strategy = dn_def_dev_strategy,
@@ -373,8 +369,8 @@ static ctl_table dn_table[] = {
                .data = &decnet_time_wait,
                .maxlen = sizeof(int),
                .mode = 0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy = &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy = sysctl_intvec,
                .extra1 = &min_decnet_time_wait,
                .extra2 = &max_decnet_time_wait
        },
@@ -384,8 +380,8 @@ static ctl_table dn_table[] = {
                .data = &decnet_dn_count,
                .maxlen = sizeof(int),
                .mode = 0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy = &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy = sysctl_intvec,
                .extra1 = &min_state_count,
                .extra2 = &max_state_count
        },
@@ -395,8 +391,8 @@ static ctl_table dn_table[] = {
                .data = &decnet_di_count,
                .maxlen = sizeof(int),
                .mode = 0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy = &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy = sysctl_intvec,
                .extra1 = &min_state_count,
                .extra2 = &max_state_count
        },
@@ -406,8 +402,8 @@ static ctl_table dn_table[] = {
                .data = &decnet_dr_count,
                .maxlen = sizeof(int),
                .mode = 0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy = &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy = sysctl_intvec,
                .extra1 = &min_state_count,
                .extra2 = &max_state_count
        },
@@ -417,8 +413,8 @@ static ctl_table dn_table[] = {
                .data = &decnet_dst_gc_interval,
                .maxlen = sizeof(int),
                .mode = 0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy = &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy = sysctl_intvec,
                .extra1 = &min_decnet_dst_gc_interval,
                .extra2 = &max_decnet_dst_gc_interval
        },
@@ -428,72 +424,59 @@ static ctl_table dn_table[] = {
                .data = &decnet_no_fc_max_cwnd,
                .maxlen = sizeof(int),
                .mode = 0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy = &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy = sysctl_intvec,
                .extra1 = &min_decnet_no_fc_max_cwnd,
                .extra2 = &max_decnet_no_fc_max_cwnd
        },
        {
-                .ctl_name = NET_DECNET_MEM,
-                .procname = "decnet_mem",
-                .data = &sysctl_decnet_mem,
-                .maxlen = sizeof(sysctl_decnet_mem),
-                .mode = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = NET_DECNET_RMEM,
-                .procname = "decnet_rmem",
-                .data = &sysctl_decnet_rmem,
-                .maxlen = sizeof(sysctl_decnet_rmem),
-                .mode = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = NET_DECNET_WMEM,
-                .procname = "decnet_wmem",
-                .data = &sysctl_decnet_wmem,
-                .maxlen = sizeof(sysctl_decnet_wmem),
-                .mode = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
+               .ctl_name = NET_DECNET_MEM,
+               .procname = "decnet_mem",
+               .data = &sysctl_decnet_mem,
+               .maxlen = sizeof(sysctl_decnet_mem),
+               .mode = 0644,
+               .proc_handler = proc_dointvec,
+               .strategy = sysctl_intvec,
+       },
+       {
+               .ctl_name = NET_DECNET_RMEM,
+               .procname = "decnet_rmem",
+               .data = &sysctl_decnet_rmem,
+               .maxlen = sizeof(sysctl_decnet_rmem),
+               .mode = 0644,
+               .proc_handler = proc_dointvec,
+               .strategy = sysctl_intvec,
+       },
+       {
+               .ctl_name = NET_DECNET_WMEM,
+               .procname = "decnet_wmem",
+               .data = &sysctl_decnet_wmem,
+               .maxlen = sizeof(sysctl_decnet_wmem),
+               .mode = 0644,
+               .proc_handler = proc_dointvec,
+               .strategy = sysctl_intvec,
+       },
        {
                .ctl_name = NET_DECNET_DEBUG_LEVEL,
                .procname = "debug",
                .data = &decnet_debug_level,
                .maxlen = sizeof(int),
                .mode = 0644,
-               .proc_handler = &proc_dointvec,
-               .strategy = &sysctl_intvec,
+               .proc_handler = proc_dointvec,
+               .strategy = sysctl_intvec,
        },
        {0}
 };
 
-static ctl_table dn_dir_table[] = {
-       {
-               .ctl_name = NET_DECNET, 
-               .procname = "decnet", 
-               .mode = 0555, 
-               .child = dn_table},
-       {0}
-};
-
-static ctl_table dn_root_table[] = {
-       {
-               .ctl_name = CTL_NET, 
-               .procname = "net", 
-               .mode = 0555, 
-               .child = dn_dir_table
-       },
-       {0}
+static struct ctl_path dn_path[] = {
+       { .procname = "net", .ctl_name = CTL_NET, },
+       { .procname = "decnet", .ctl_name = NET_DECNET, },
+       { }
 };
 
 void dn_register_sysctl(void)
 {
-       dn_table_header = register_sysctl_table(dn_root_table, 1);
+       dn_table_header = register_sysctl_paths(dn_path, dn_table);
 }
 
 void dn_unregister_sysctl(void)