5 files changed, 18 insertions, 11 deletions

diff --git a/include/net/udp.h b/include/net/udp.h
index 77af7d46d868..0079d17fd3a3 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -189,8 +189,8 @@ struct udp_seq_afinfo {
         char                    *name;
         sa_family_t             family;
         struct hlist_head       *hashtable;
-        int                     (*seq_show) (struct seq_file *m, void *v);
         struct file_operations  *seq_fops;
+        struct seq_operations   seq_ops;
 };
 
 struct udp_iter_state {
@@ -198,7 +198,6 @@ struct udp_iter_state {
         sa_family_t             family;
         struct hlist_head       *hashtable;
         int                     bucket;
-        struct seq_operations   seq_ops;
 };
 
 #ifdef CONFIG_PROC_FS
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index eb0c64da2634..bae94b3eaa43 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1591,13 +1591,9 @@ static int udp_seq_open(struct inode *inode, struct file *file)
 
         s->family               = afinfo->family;
         s->hashtable            = afinfo->hashtable;
-        s->seq_ops.start        = udp_seq_start;
-        s->seq_ops.next         = udp_seq_next;
-        s->seq_ops.show         = afinfo->seq_show;
-        s->seq_ops.stop         = udp_seq_stop;
         s->p.net                = net;
 
-        rc = seq_open(file, &s->seq_ops);
+        rc = seq_open(file, &afinfo->seq_ops);
         if (rc)
                 goto out_put_net;
 
@@ -1634,6 +1630,10 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
         afinfo->seq_fops->llseek        = seq_lseek;
         afinfo->seq_fops->release       = udp_seq_release;
 
+        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);
         if (p)
                 p->data = afinfo;
@@ -1690,8 +1690,10 @@ static struct udp_seq_afinfo udp4_seq_afinfo = {
         .name           = "udp",
         .family         = AF_INET,
         .hashtable      = udp_hash,
-        .seq_show       = udp4_seq_show,
         .seq_fops       = &udp4_seq_fops,
+        .seq_ops        = {
+                .show           = udp4_seq_show,
+        },
 };
 
 static int udp4_proc_init_net(struct net *net)
diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 7c1e0271c0db..4add87553bce 100644
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -77,8 +77,10 @@ static struct udp_seq_afinfo udplite4_seq_afinfo = {
         .name           = "udplite",
         .family         = AF_INET,
         .hashtable      = udplite_hash,
-        .seq_show       = udp4_seq_show,
         .seq_fops       = &udplite4_seq_fops,
+        .seq_ops        = {
+                .show           = udp4_seq_show,
+        },
 };
 
 static int udplite4_proc_init_net(struct net *net)
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 463ae4d448a3..e35921a46689 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -983,8 +983,10 @@ static struct udp_seq_afinfo udp6_seq_afinfo = {
         .name           = "udp6",
         .family         = AF_INET6,
         .hashtable      = udp_hash,
-        .seq_show       = udp6_seq_show,
         .seq_fops       = &udp6_seq_fops,
+        .seq_ops        = {
+                .show           = udp6_seq_show,
+        },
 };
 
 int udp6_proc_init(struct net *net)
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index c5f5357d115d..710366c3f0a6 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -102,8 +102,10 @@ static struct udp_seq_afinfo udplite6_seq_afinfo = {
         .name           = "udplite6",
         .family         = AF_INET6,
         .hashtable      = udplite_hash,
-        .seq_show       = udp6_seq_show,
         .seq_fops       = &udplite6_seq_fops,
+        .seq_ops        = {
+                .show           = udp6_seq_show,
+        },
 };
 
 static int udplite6_proc_init_net(struct net *net)