Skip to content

Commit

Permalink
proc: clean the ip_misc_proc_init and ip_proc_init_net error paths
Browse files Browse the repository at this point in the history
After all this stuff is moved outside, this function can look better.

Besides, I tuned the error path in ip_proc_init_net to make it have
only 2 exit points, not 3.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Jul 18, 2008
1 parent 8e3461d commit 60bdde9
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions net/ipv4/proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ static const struct file_operations netstat_seq_fops = {
static __net_init int ip_proc_init_net(struct net *net)
{
if (!proc_net_fops_create(net, "sockstat", S_IRUGO, &sockstat_seq_fops))
return -ENOMEM;
goto out_sockstat;
if (!proc_net_fops_create(net, "netstat", S_IRUGO, &netstat_seq_fops))
goto out_netstat;
if (!proc_net_fops_create(net, "snmp", S_IRUGO, &snmp_seq_fops))
Expand All @@ -520,6 +520,7 @@ static __net_init int ip_proc_init_net(struct net *net)
proc_net_remove(net, "netstat");
out_netstat:
proc_net_remove(net, "sockstat");
out_sockstat:
return -ENOMEM;
}

Expand All @@ -537,16 +538,6 @@ static __net_initdata struct pernet_operations ip_proc_ops = {

int __init ip_misc_proc_init(void)
{
int rc = 0;

if (register_pernet_subsys(&ip_proc_ops))
goto out_pernet;

out:
return rc;

out_pernet:
rc = -ENOMEM;
goto out;
return register_pernet_subsys(&ip_proc_ops);
}

0 comments on commit 60bdde9

Please sign in to comment.