Commit a4146b1b authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller

[TCP]: Replace struct net on tcp_iter_state with seq_net_private.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2cf83afe
...@@ -1333,7 +1333,7 @@ struct tcp_seq_afinfo { ...@@ -1333,7 +1333,7 @@ struct tcp_seq_afinfo {
}; };
struct tcp_iter_state { struct tcp_iter_state {
struct net *net; struct seq_net_private p;
sa_family_t family; sa_family_t family;
enum tcp_seq_states state; enum tcp_seq_states state;
struct sock *syn_wait_sk; struct sock *syn_wait_sk;
......
...@@ -1954,7 +1954,7 @@ static void *listening_get_next(struct seq_file *seq, void *cur) ...@@ -1954,7 +1954,7 @@ static void *listening_get_next(struct seq_file *seq, void *cur)
struct hlist_node *node; struct hlist_node *node;
struct sock *sk = cur; struct sock *sk = cur;
struct tcp_iter_state* st = seq->private; struct tcp_iter_state* st = seq->private;
struct net *net = st->net; struct net *net = seq_file_net(seq);
if (!sk) { if (!sk) {
st->bucket = 0; st->bucket = 0;
...@@ -2035,7 +2035,7 @@ static void *listening_get_idx(struct seq_file *seq, loff_t *pos) ...@@ -2035,7 +2035,7 @@ static void *listening_get_idx(struct seq_file *seq, loff_t *pos)
static void *established_get_first(struct seq_file *seq) static void *established_get_first(struct seq_file *seq)
{ {
struct tcp_iter_state* st = seq->private; struct tcp_iter_state* st = seq->private;
struct net *net = st->net; struct net *net = seq_file_net(seq);
void *rc = NULL; void *rc = NULL;
for (st->bucket = 0; st->bucket < tcp_hashinfo.ehash_size; ++st->bucket) { for (st->bucket = 0; st->bucket < tcp_hashinfo.ehash_size; ++st->bucket) {
...@@ -2076,7 +2076,7 @@ static void *established_get_next(struct seq_file *seq, void *cur) ...@@ -2076,7 +2076,7 @@ static void *established_get_next(struct seq_file *seq, void *cur)
struct inet_timewait_sock *tw; struct inet_timewait_sock *tw;
struct hlist_node *node; struct hlist_node *node;
struct tcp_iter_state* st = seq->private; struct tcp_iter_state* st = seq->private;
struct net *net = st->net; struct net *net = seq_file_net(seq);
++st->num; ++st->num;
...@@ -2233,7 +2233,7 @@ static int tcp_seq_open(struct inode *inode, struct file *file) ...@@ -2233,7 +2233,7 @@ static int tcp_seq_open(struct inode *inode, struct file *file)
s->seq_ops.next = tcp_seq_next; s->seq_ops.next = tcp_seq_next;
s->seq_ops.show = afinfo->seq_show; s->seq_ops.show = afinfo->seq_show;
s->seq_ops.stop = tcp_seq_stop; s->seq_ops.stop = tcp_seq_stop;
s->net = net; s->p.net = net;
rc = seq_open(file, &s->seq_ops); rc = seq_open(file, &s->seq_ops);
if (rc) if (rc)
...@@ -2252,9 +2252,8 @@ static int tcp_seq_open(struct inode *inode, struct file *file) ...@@ -2252,9 +2252,8 @@ static int tcp_seq_open(struct inode *inode, struct file *file)
static int tcp_seq_release(struct inode *inode, struct file *file) static int tcp_seq_release(struct inode *inode, struct file *file)
{ {
struct seq_file *seq = file->private_data; struct seq_file *seq = file->private_data;
struct tcp_iter_state *s = seq->private;
put_net(s->net); put_net(seq_file_net(seq));
seq_release_private(inode, file); seq_release_private(inode, file);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment