[netfilter-cvslog] r3987 - trunk/patch-o-matic-ng/CLUSTERIP/linux-2.6/net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-06-22 14:25:15 +0200 (Wed, 22 Jun 2005)
New Revision: 3987

Modified:
   trunk/patch-o-matic-ng/CLUSTERIP/linux-2.6/net/ipv4/netfilter/ipt_CLUSTERIP.c
Log:
sync with latest (2.6.12) kernel changes


Modified: trunk/patch-o-matic-ng/CLUSTERIP/linux-2.6/net/ipv4/netfilter/ipt_CLUSTERIP.c
===================================================================
--- trunk/patch-o-matic-ng/CLUSTERIP/linux-2.6/net/ipv4/netfilter/ipt_CLUSTERIP.c	2005-06-22 12:24:21 UTC (rev 3986)
+++ trunk/patch-o-matic-ng/CLUSTERIP/linux-2.6/net/ipv4/netfilter/ipt_CLUSTERIP.c	2005-06-22 12:25:15 UTC (rev 3987)
@@ -29,6 +29,7 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_CLUSTERIP.h>
 #include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter_ipv4/lockhelp.h>
 
 #define CLUSTERIP_VERSION "0.6"
 
@@ -66,7 +67,7 @@
 
 /* clusterip_lock protects the clusterip_configs list _AND_ the configurable
  * data within all structurses (num_local_nodes, local_nodes[]) */
-DECLARE_RWLOCK(clusterip_lock);
+static DECLARE_RWLOCK(clusterip_lock);
 
 #ifdef CONFIG_PROC_FS
 static struct file_operations clusterip_proc_fops;
@@ -664,7 +665,7 @@
 	return ret;
 }
 
-static ssize_t clusterip_proc_write(struct file *file, const char *input,
+static ssize_t clusterip_proc_write(struct file *file, const char __user *input,
 				size_t size, loff_t *ofs)
 {
 #define PROC_WRITELEN	10