From patchwork Fri Dec 16 12:05:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Igor_Maravi=C4=87?= X-Patchwork-Id: 131816 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7BCA31007D7 for ; Fri, 16 Dec 2011 23:06:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751913Ab1LPMFq (ORCPT ); Fri, 16 Dec 2011 07:05:46 -0500 Received: from mx1.etf.rs ([147.91.14.169]:34373 "EHLO mx1.etf.bg.ac.rs" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751499Ab1LPMFp (ORCPT ); Fri, 16 Dec 2011 07:05:45 -0500 Received: from localhost (avs2.etf.rs [147.91.14.173]) by mx1.etf.bg.ac.rs (Postfix) with ESMTP id E73A2120140; Fri, 16 Dec 2011 13:05:42 +0100 (CET) X-Virus-Scanned: amavisd-new at etf.rs Received: from mx1.etf.bg.ac.rs ([147.91.14.169]) by localhost (avs2.etf.rs [147.91.14.171]) (amavisd-new, port 10026) with ESMTP id Lm1IYnE2WMfs; Fri, 16 Dec 2011 13:05:41 +0100 (CET) Received: from igor-PC.etf.bg.ac.rs (dhcp19.etf.bg.ac.rs [147.91.9.148]) by mx1.etf.bg.ac.rs (Postfix) with ESMTP id 90B77120119; Fri, 16 Dec 2011 13:05:41 +0100 (CET) From: igorm@etf.rs To: netdev@vger.kernel.org Cc: davem@davemloft.net, Igor Maravic Subject: [PATCH net-next] net: ipv6: proc: Fix error handling Date: Fri, 16 Dec 2011 13:05:39 +0100 Message-Id: <1324037139-3626-1-git-send-email-igorm@etf.rs> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Igor Maravic Fix error handling in case making of dir dev_snmp6 failes Signed-off-by: Igor Maravic Acked-by: Eric Dumazet --- 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; }