* [PATCH net-next] net: ipv6: proc: Fix error handling
@ 2011-12-16 12:05 igorm
2011-12-16 12:21 ` Eric Dumazet
0 siblings, 1 reply; 2+ messages in thread
From: igorm @ 2011-12-16 12:05 UTC (permalink / raw)
To: netdev; +Cc: davem, Igor Maravic
From: Igor Maravic <igorm@etf.rs>
Fix error handling in case making of dir dev_snmp6 failes
Signed-off-by: Igor Maravic <igorm@etf.rs>
---
net/ipv6/proc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index fdeb6d0..6df9035 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -307,10 +307,10 @@ static int __net_init ipv6_proc_init_net(struct net *net)
goto proc_dev_snmp6_fail;
return 0;
+proc_dev_snmp6_fail:
+ proc_net_remove(net, "snmp6");
proc_snmp6_fail:
proc_net_remove(net, "sockstat6");
-proc_dev_snmp6_fail:
- proc_net_remove(net, "dev_snmp6");
return -ENOMEM;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: ipv6: proc: Fix error handling
2011-12-16 12:05 [PATCH net-next] net: ipv6: proc: Fix error handling igorm
@ 2011-12-16 12:21 ` Eric Dumazet
0 siblings, 0 replies; 2+ messages in thread
From: Eric Dumazet @ 2011-12-16 12:21 UTC (permalink / raw)
To: igorm; +Cc: netdev, davem
Le vendredi 16 décembre 2011 à 13:05 +0100, igorm@etf.rs a écrit :
> From: Igor Maravic <igorm@etf.rs>
>
> Fix error handling in case making of dir dev_snmp6 failes
>
> Signed-off-by: Igor Maravic <igorm@etf.rs>
> ---
> net/ipv6/proc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
> index fdeb6d0..6df9035 100644
> --- a/net/ipv6/proc.c
> +++ b/net/ipv6/proc.c
> @@ -307,10 +307,10 @@ static int __net_init ipv6_proc_init_net(struct net *net)
> goto proc_dev_snmp6_fail;
> return 0;
>
> +proc_dev_snmp6_fail:
> + proc_net_remove(net, "snmp6");
> proc_snmp6_fail:
> proc_net_remove(net, "sockstat6");
> -proc_dev_snmp6_fail:
> - proc_net_remove(net, "dev_snmp6");
> return -ENOMEM;
> }
>
Good catch, thanks !
(Should probably be applied on net tree, not net-next)
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-16 12:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-16 12:05 [PATCH net-next] net: ipv6: proc: Fix error handling igorm
2011-12-16 12:21 ` Eric Dumazet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox