From: Denis V. Lunev <den@openvz.org>
Date: Sat, 29 Mar 2008 01:23:33 +0000 (-0700)
Subject: [UDP]: Replace struct net on udp_iter_state with seq_net_private.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6f191efe48af62dd5f8917dd21d187f896cd6c81;p=openwrt%2Fstaging%2Fblogic.git

[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 635940d374ab..77af7d46d868 100644
--- 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 0255f373b3e5..d695097be2dc 100644
--- 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;
 }