[UDP]: Replace struct net on udp_iter_state with seq_net_private.

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 635940d374ab4eacab98913419984e4dc17c0cee..77af7d46d8689789083f4eb485d77eb2de25316b 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -194,7 +194,7 @@ struct udp_seq_afinfo {
 };
 
 struct udp_iter_state {
-       struct net              *net;
+       struct seq_net_private  p;
        sa_family_t             family;
        struct hlist_head       *hashtable;
        int                     bucket;

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 0255f373b3e55d54acf16e19ae55d9a6a43ed008..d695097be2dcaee90d60986c1294177002ebfe3a 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1503,7 +1503,7 @@ static struct sock *udp_get_first(struct seq_file *seq)
 {
        struct sock *sk;
        struct udp_iter_state *state = seq->private;
-       struct net *net = state->net;
+       struct net *net = seq_file_net(seq);
 
        for (state->bucket = 0; state->bucket < UDP_HTABLE_SIZE; ++state->bucket) {
                struct hlist_node *node;
@@ -1522,7 +1522,7 @@ found:
 static struct sock *udp_get_next(struct seq_file *seq, struct sock *sk)
 {
        struct udp_iter_state *state = seq->private;
-       struct net *net = state->net;
+       struct net *net = seq_file_net(seq);
 
        do {
                sk = sk_next(sk);
@@ -1595,7 +1595,7 @@ static int udp_seq_open(struct inode *inode, struct file *file)
        s->seq_ops.next         = udp_seq_next;
        s->seq_ops.show         = afinfo->seq_show;
        s->seq_ops.stop         = udp_seq_stop;
-       s->net                  = net;
+       s->p.net                = net;
 
        rc = seq_open(file, &s->seq_ops);
        if (rc)
@@ -1617,7 +1617,7 @@ static int udp_seq_release(struct inode *inode, struct file *file)
        struct seq_file *seq = file->private_data;
        struct udp_iter_state *s = seq->private;
 
-       put_net(s->net);
+       put_net(s->p.net);
        seq_release_private(inode, file);
        return 0;
 }