[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>

diff --git a/include/net/udp.h b/include/net/udp.h
index 5cf0e593dda7811649ae6fb7cf10a0f431378bbf..24a41fa316415082994e421ed0b5a2aee3de7e3f 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -185,7 +185,6 @@ DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
 
 /* /proc */
 struct udp_seq_afinfo {
-       struct module           *owner;
        char                    *name;
        sa_family_t             family;
        struct hlist_head       *hashtable;

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index a95dff8063a4e987ce109ef21dfd2645c740a927..9143645f9a1be7e4d7488689a9f4b1fee9e20d64 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1596,7 +1596,6 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
        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 @@ int udp4_seq_show(struct seq_file *seq, void *v)
 
 /* ------------------------------------------------------------------------ */
 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,
        },

diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 148ae72af111550ddeeb8cfa833c8b4397f849a4..72ce26b6c4d337b10533b95db0577a9c184cede3 100644 (file)
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -72,10 +72,12 @@ static struct inet_protosw udplite4_protosw = {
 
 #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,
        },

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index ff8d53ecdd60212c10bf0aa2d9d4618a448da9b8..30ef7dc5d403fe7080fd06e7f8ec2a81fc2e8e94 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -978,10 +978,12 @@ int udp6_seq_show(struct seq_file *seq, void *v)
 }
 
 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,
        },

diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index 5adf651d07215b725e13d228f63c6e2ec996cd74..491efd00a86671af20bf607b85f63869b11881ac 100644 (file)
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -97,10 +97,12 @@ void udplitev6_exit(void)
 
 #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,
        },