fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / sunrpc / sysctl.c

diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 730f47d..82b2752 100644 (file)
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -7,7 +7,6 @@
  * impossible at the moment.
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/linkage.h>
 #include <linux/ctype.h>
@@ -19,7 +18,6 @@
 #include <linux/sunrpc/types.h>
 #include <linux/sunrpc/sched.h>
 #include <linux/sunrpc/stats.h>
-#include <linux/sunrpc/xprt.h>
 
 /*
  * Declare the debug flags here
@@ -58,13 +56,14 @@ rpc_unregister_sysctl(void)
 
 static int
 proc_dodebug(ctl_table *table, int write, struct file *file,
-                               void *buffer, size_t *lenp)
+                               void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-       char            tmpbuf[20], *p, c;
+       char            tmpbuf[20], c, *s;
+       char __user *p;
        unsigned int    value;
        size_t          left, len;
 
-       if ((file->f_pos && !write) || !*lenp) {
+       if ((*ppos && !write) || !*lenp) {
                *lenp = 0;
                return 0;
        }
@@ -74,7 +73,7 @@ proc_dodebug(ctl_table *table, int write, struct file *file,
        if (write) {
                if (!access_ok(VERIFY_READ, buffer, left))
                        return -EFAULT;
-               p = (char *) buffer;
+               p = buffer;
                while (left && __get_user(c, p) >= 0 && isspace(c))
                        left--, p++;
                if (!left)
@@ -86,12 +85,12 @@ proc_dodebug(ctl_table *table, int write, struct file *file,
                        return -EFAULT;
                tmpbuf[left] = '\0';
 
-               for (p = tmpbuf, value = 0; '0' <= *p && *p <= '9'; p++, left--)
-                       value = 10 * value + (*p - '0');
-               if (*p && !isspace(*p))
+               for (s = tmpbuf, value = 0; '0' <= *s && *s <= '9'; s++, left--)
+                       value = 10 * value + (*s - '0');
+               if (*s && !isspace(*s))
                        return -EINVAL;
-               while (left && isspace(*p))
-                       left--, p++;
+               while (left && isspace(*s))
+                       left--, s++;
                *(unsigned int *) table->data = value;
                /* Display the RPC tasks on writing to rpc_debug */
                if (table->ctl_name == CTL_RPCDEBUG) {
@@ -106,7 +105,7 @@ proc_dodebug(ctl_table *table, int write, struct file *file,
                if (__copy_to_user(buffer, tmpbuf, len))
                        return -EFAULT;
                if ((left -= len) > 0) {
-                       if (put_user('\n', (char *)buffer + len))
+                       if (put_user('\n', (char __user *)buffer + len))
                                return -EFAULT;
                        left--;
                }
@@ -114,12 +113,10 @@ proc_dodebug(ctl_table *table, int write, struct file *file,
 
 done:
        *lenp -= left;
-       file->f_pos += *lenp;
+       *ppos += *lenp;
        return 0;
 }
 
-static unsigned int min_slot_table_size = RPC_MIN_SLOT_TABLE;
-static unsigned int max_slot_table_size = RPC_MAX_SLOT_TABLE;
 
 static ctl_table debug_table[] = {
        {
@@ -154,28 +151,6 @@ static ctl_table debug_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_dodebug
        }, 
-       {
-               .ctl_name       = CTL_SLOTTABLE_UDP,
-               .procname       = "udp_slot_table_entries",
-               .data           = &xprt_udp_slot_table_entries,
-               .maxlen         = sizeof(unsigned int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec_minmax,
-               .strategy       = &sysctl_intvec,
-               .extra1         = &min_slot_table_size,
-               .extra2         = &max_slot_table_size
-       },
-       {
-               .ctl_name       = CTL_SLOTTABLE_TCP,
-               .procname       = "tcp_slot_table_entries",
-               .data           = &xprt_tcp_slot_table_entries,
-               .maxlen         = sizeof(unsigned int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec_minmax,
-               .strategy       = &sysctl_intvec,
-               .extra1         = &min_slot_table_size,
-               .extra2         = &max_slot_table_size
-       },
        { .ctl_name = 0 }
 };