From d6e80373f116e5ee075dc17315c04610b0a3dea2 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 18 Jul 2008 04:06:50 -0700 Subject: [PATCH] --- yaml --- r: 103628 b: refs/heads/master c: 60bdde95807e982a824be9cfdd35055cc721a88a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/proc.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index f14eb46ad880..7dd11bf15da3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e3461d01bdbc3dbf993448ed9ad4acaaeb6495d +refs/heads/master: 60bdde95807e982a824be9cfdd35055cc721a88a diff --git a/trunk/net/ipv4/proc.c b/trunk/net/ipv4/proc.c index 120e1f7461da..554390431a4e 100644 --- a/trunk/net/ipv4/proc.c +++ b/trunk/net/ipv4/proc.c @@ -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)) @@ -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; } @@ -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); }