commit 4ad96d39a2d74c1b2e400b602da2594f5098fc26
author Denis V. Lunev <den@openvz.org> Fri Mar 28 18:25:53 2008 -0700
committer David S. Miller <davem@davemloft.net> Fri Mar 28 18:25:53 2008 -0700
tree 570666522e544892feba440728a59f336e13c3dd
parent 3ba9441bdf07370670a684e6d95dfc523476677f

[UDP]: Remove owner from udp_seq_afinfo.

Move it to udp_seq_afinfo->seq_fops as should be.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

include/net/udp.h

diff --git a/include/net/udp.h b/include/net/udp.h
index 5cf0e59..24a41fa 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -185,7 +185,6 @@
 
 /* /proc */
 struct udp_seq_afinfo {
-	struct module		*owner;
 	char			*name;
 	sa_family_t		family;
 	struct hlist_head	*hashtable;

net/ipv4/udp.c

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index a95dff8..9143645 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1596,7 +1596,6 @@
 	struct proc_dir_entry *p;
 	int rc = 0;
 
-	afinfo->seq_fops.owner		= afinfo->owner;
 	afinfo->seq_fops.open		= udp_seq_open;
 	afinfo->seq_fops.read		= seq_read;
 	afinfo->seq_fops.llseek		= seq_lseek;
@@ -1656,10 +1655,12 @@
 
 /* ------------------------------------------------------------------------ */
 static struct udp_seq_afinfo udp4_seq_afinfo = {
-	.owner		= THIS_MODULE,
 	.name		= "udp",
 	.family		= AF_INET,
 	.hashtable	= udp_hash,
+	.seq_fops	= {
+		.owner	=	THIS_MODULE,
+	},
 	.seq_ops	= {
 		.show		= udp4_seq_show,
 	},

net/ipv4/udplite.c

diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 148ae72..72ce26b 100644
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -72,10 +72,12 @@
 
 #ifdef CONFIG_PROC_FS
 static struct udp_seq_afinfo udplite4_seq_afinfo = {
-	.owner		= THIS_MODULE,
 	.name		= "udplite",
 	.family		= AF_INET,
 	.hashtable	= udplite_hash,
+	.seq_fops	= {
+		.owner	=	THIS_MODULE,
+	},
 	.seq_ops	= {
 		.show		= udp4_seq_show,
 	},

net/ipv6/udp.c

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index ff8d53e..30ef7dc 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -978,10 +978,12 @@
 }
 
 static struct udp_seq_afinfo udp6_seq_afinfo = {
-	.owner		= THIS_MODULE,
 	.name		= "udp6",
 	.family		= AF_INET6,
 	.hashtable	= udp_hash,
+	.seq_fops	= {
+		.owner	=	THIS_MODULE,
+	},
 	.seq_ops	= {
 		.show		= udp6_seq_show,
 	},

net/ipv6/udplite.c

diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index 5adf651..491efd0 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -97,10 +97,12 @@
 
 #ifdef CONFIG_PROC_FS
 static struct udp_seq_afinfo udplite6_seq_afinfo = {
-	.owner		= THIS_MODULE,
 	.name		= "udplite6",
 	.family		= AF_INET6,
 	.hashtable	= udplite_hash,
+	.seq_fops	= {
+		.owner	=	THIS_MODULE,
+	},
 	.seq_ops	= {
 		.show		= udp6_seq_show,
 	},