lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv4: assign PDE->data before gluing PDE into /proc tree

Browse Source 
The check for PDE->data != NULL becomes useless after the replacement
of proc_net_fops_create with proc_create_data.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev
2008-05-02 04:10:08 -07:00
committed by David S. Miller
parent 1d3faa390d
commit 84841c3c6c
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv4/tcp_ipv4.c
View File

@@ -2214,9 +2214,6 @@ static int tcp_seq_open(struct inode *inode, struct file *file)
struct tcp_iter_state *s; struct tcp_iter_state *s;
int err; int err;
if (unlikely(afinfo == NULL))
return -EINVAL;
err = seq_open_net(inode, file, &afinfo->seq_ops, err = seq_open_net(inode, file, &afinfo->seq_ops,
sizeof(struct tcp_iter_state)); sizeof(struct tcp_iter_state));
if (err < 0) if (err < 0)
@@ -2241,10 +2238,9 @@ int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo)
afinfo->seq_ops.next = tcp_seq_next; afinfo->seq_ops.next = tcp_seq_next;
afinfo->seq_ops.stop = tcp_seq_stop; afinfo->seq_ops.stop = tcp_seq_stop;
p = proc_net_fops_create(net, afinfo->name, S_IRUGO, &afinfo->seq_fops); p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net,
if (p) &afinfo->seq_fops, afinfo);
p->data = afinfo; if (!p)
else
rc = -ENOMEM; rc = -ENOMEM;
return rc; return rc;
} }

7
net/ipv4/udp.c
View File

@@ -1605,10 +1605,9 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
afinfo->seq_ops.next = udp_seq_next; afinfo->seq_ops.next = udp_seq_next;
afinfo->seq_ops.stop = udp_seq_stop; afinfo->seq_ops.stop = udp_seq_stop;
p = proc_net_fops_create(net, afinfo->name, S_IRUGO, &afinfo->seq_fops); p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net,
if (p) &afinfo->seq_fops, afinfo);
p->data = afinfo; if (!p)
else
rc = -ENOMEM; rc = -ENOMEM;
return rc; return rc;
} }