[UDP]: Place file operations directly into udp_seq_afinfo.

No need to have separate never-used variable.

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 0079d17..5cf0e59 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -189,7 +189,7 @@ struct udp_seq_afinfo {
        char                    *name;
        sa_family_t             family;
        struct hlist_head       *hashtable;
-       struct file_operations  *seq_fops;
+       struct file_operations  seq_fops;
        struct seq_operations   seq_ops;
 };
 

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index e716d2d..a95dff8 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1596,17 +1596,17 @@ 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;
-       afinfo->seq_fops->release       = seq_release_net;
+       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;
+       afinfo->seq_fops.release        = seq_release_net;
 
        afinfo->seq_ops.start           = udp_seq_start;
        afinfo->seq_ops.next            = udp_seq_next;
        afinfo->seq_ops.stop            = udp_seq_stop;
 
-       p = proc_net_fops_create(net, afinfo->name, S_IRUGO, afinfo->seq_fops);
+       p = proc_net_fops_create(net, afinfo->name, S_IRUGO, &afinfo->seq_fops);
        if (p)
                p->data = afinfo;
        else
@@ -1617,7 +1617,6 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
 void udp_proc_unregister(struct net *net, struct udp_seq_afinfo *afinfo)
 {
        proc_net_remove(net, afinfo->name);
-       memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops));
 }
 
 /* ------------------------------------------------------------------------ */
@@ -1656,13 +1655,11 @@ int udp4_seq_show(struct seq_file *seq, void *v)
 }
 
 /* ------------------------------------------------------------------------ */
-static struct file_operations udp4_seq_fops;
 static struct udp_seq_afinfo udp4_seq_afinfo = {
        .owner          = THIS_MODULE,
        .name           = "udp",
        .family         = AF_INET,
        .hashtable      = udp_hash,
-       .seq_fops       = &udp4_seq_fops,
        .seq_ops        = {
                .show           = udp4_seq_show,
        },

diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 4add875..148ae72 100644 (file)
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -71,13 +71,11 @@ static struct inet_protosw udplite4_protosw = {
 };
 
 #ifdef CONFIG_PROC_FS
-static struct file_operations udplite4_seq_fops;
 static struct udp_seq_afinfo udplite4_seq_afinfo = {
        .owner          = THIS_MODULE,
        .name           = "udplite",
        .family         = AF_INET,
        .hashtable      = udplite_hash,
-       .seq_fops       = &udplite4_seq_fops,
        .seq_ops        = {
                .show           = udp4_seq_show,
        },

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index e35921a..ff8d53e 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -977,13 +977,11 @@ int udp6_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct file_operations udp6_seq_fops;
 static struct udp_seq_afinfo udp6_seq_afinfo = {
        .owner          = THIS_MODULE,
        .name           = "udp6",
        .family         = AF_INET6,
        .hashtable      = udp_hash,
-       .seq_fops       = &udp6_seq_fops,
        .seq_ops        = {
                .show           = udp6_seq_show,
        },

diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index 710366c..5adf651 100644 (file)
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -96,13 +96,11 @@ void udplitev6_exit(void)
 }
 
 #ifdef CONFIG_PROC_FS
-static struct file_operations udplite6_seq_fops;
 static struct udp_seq_afinfo udplite6_seq_afinfo = {
        .owner          = THIS_MODULE,
        .name           = "udplite6",
        .family         = AF_INET6,
        .hashtable      = udplite_hash,
-       .seq_fops       = &udplite6_seq_fops,
        .seq_ops        = {
                .show           = udp6_seq_show,
        },