From patchwork Mon Aug 20 01:11:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?J=CE=B5an_Sacren?= X-Patchwork-Id: 178607 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 2EAAE2C0099 for ; Mon, 20 Aug 2012 11:14:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752375Ab2HTBOm (ORCPT ); Sun, 19 Aug 2012 21:14:42 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:47345 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751567Ab2HTBOk (ORCPT ); Sun, 19 Aug 2012 21:14:40 -0400 Received: by pbbrr13 with SMTP id rr13so6187787pbb.19 for ; Sun, 19 Aug 2012 18:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=bVQ7zzd9OPDJK3E1bZLV6JFiWIBMLwkyaNhtT97XGEI=; b=Nzcr5sZk051bpmQotWAZdoLeQUdJK3g83Lrsq4fKqP3mTeWn1wQEDR4kFdnjAdYA6K eXsnE6VMvH4IJVCJ1aRkuHzvHk8KuP/A2GECOWKQ3pNniOdTOMV6lTQnBAsn3dzWeNm4 /qzfqCJNOcc8JrGAdEcnWnd8ZyQHrswEPimen++0wjUFS1iJIUaQRIeWGns/X/CmPLIG F6qWEeOG5UYyySCfgbEh50nyv/up6NDQXu0Oz8yyN6/r7DCNjkc568I/GpZwl6iTRhGM 3SwP0vb7tX0GncE/x+F4xCCvMIovCo9Y5bhH8/D47kP5M9exPLxIt86ucKmJdXFOVyMv lP9g== Received: by 10.68.132.194 with SMTP id ow2mr30085287pbb.36.1345425279213; Sun, 19 Aug 2012 18:14:39 -0700 (PDT) Received: from localhost ([67.214.237.222]) by mx.google.com with ESMTPS id wf7sm9936719pbc.34.2012.08.19.18.14.37 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 19 Aug 2012 18:14:38 -0700 (PDT) From: Jean Sacren To: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next] ipv4/netfilter: remove unnecessary goto statement for error recovery Date: Sun, 19 Aug 2012 19:11:32 -0600 Message-Id: <1345425092-11905-1-git-send-email-sakiwit@gmail.com> X-Mailer: git-send-email 1.7.8.6 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Usually it's a good practice to use goto statement for error recovery when initializing the module. This approach could be an overkill if: 1) there is only one fail case; 2) success and failure use the same return statement. For a cleaner approach, remove the unnecessary goto statement and directly implement error recovery. Signed-off-by: Jean Sacren --- net/ipv4/netfilter/iptable_filter.c | 6 +----- net/ipv4/netfilter/iptable_mangle.c | 6 +----- net/ipv4/netfilter/iptable_raw.c | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/netfilter/iptable_filter.c b/net/ipv4/netfilter/iptable_filter.c index 851acec8..9255fd4 100644 --- a/net/ipv4/netfilter/iptable_filter.c +++ b/net/ipv4/netfilter/iptable_filter.c @@ -96,14 +96,10 @@ static int __init iptable_filter_init(void) filter_ops = xt_hook_link(&packet_filter, iptable_filter_hook); if (IS_ERR(filter_ops)) { ret = PTR_ERR(filter_ops); - goto cleanup_table; + unregister_pernet_subsys(&iptable_filter_net_ops); } return ret; - - cleanup_table: - unregister_pernet_subsys(&iptable_filter_net_ops); - return ret; } static void __exit iptable_filter_fini(void) diff --git a/net/ipv4/netfilter/iptable_mangle.c b/net/ipv4/netfilter/iptable_mangle.c index aef5d1f..25549c5 100644 --- a/net/ipv4/netfilter/iptable_mangle.c +++ b/net/ipv4/netfilter/iptable_mangle.c @@ -131,14 +131,10 @@ static int __init iptable_mangle_init(void) mangle_ops = xt_hook_link(&packet_mangler, iptable_mangle_hook); if (IS_ERR(mangle_ops)) { ret = PTR_ERR(mangle_ops); - goto cleanup_table; + unregister_pernet_subsys(&iptable_mangle_net_ops); } return ret; - - cleanup_table: - unregister_pernet_subsys(&iptable_mangle_net_ops); - return ret; } static void __exit iptable_mangle_fini(void) diff --git a/net/ipv4/netfilter/iptable_raw.c b/net/ipv4/netfilter/iptable_raw.c index 07fb710..6acf7ca 100644 --- a/net/ipv4/netfilter/iptable_raw.c +++ b/net/ipv4/netfilter/iptable_raw.c @@ -75,14 +75,10 @@ static int __init iptable_raw_init(void) rawtable_ops = xt_hook_link(&packet_raw, iptable_raw_hook); if (IS_ERR(rawtable_ops)) { ret = PTR_ERR(rawtable_ops); - goto cleanup_table; + unregister_pernet_subsys(&iptable_raw_net_ops); } return ret; - - cleanup_table: - unregister_pernet_subsys(&iptable_raw_net_ops); - return ret; } static void __exit iptable_raw_fini(void)