From patchwork Mon Oct 19 05:21:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerrit Renker X-Patchwork-Id: 36352 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 23E7EB7BA7 for ; Mon, 19 Oct 2009 16:22:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752266AbZJSFWA (ORCPT ); Mon, 19 Oct 2009 01:22:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752157AbZJSFV7 (ORCPT ); Mon, 19 Oct 2009 01:21:59 -0400 Received: from dee.erg.abdn.ac.uk ([139.133.204.82]:40477 "EHLO erg.abdn.ac.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751912AbZJSFV7 (ORCPT ); Mon, 19 Oct 2009 01:21:59 -0400 Received: from laptev.erg.abdn.ac.uk (Debian-exim@ra-gerrit.erg.abdn.ac.uk [139.133.204.38]) by erg.abdn.ac.uk (8.13.4/8.13.4) with ESMTP id n9J5Lr1C012599 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Mon, 19 Oct 2009 06:21:54 +0100 (BST) Received: from gerrit by laptev.erg.abdn.ac.uk with local (Exim 4.69) (envelope-from ) id 1Mzkgr-0001MV-Ix; Mon, 19 Oct 2009 07:21:53 +0200 Date: Mon, 19 Oct 2009 07:21:53 +0200 From: Gerrit Renker To: Ivo Calado Cc: dccp@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [PATCHv2 1/4] First Patch on TFRC-SP. Copy base files from TFRC Message-ID: <20091019052153.GB3366@gerrit.erg.abdn.ac.uk> Mail-Followup-To: Gerrit Renker , Ivo Calado , dccp@vger.kernel.org, netdev@vger.kernel.org References: <4AD4B677.4000308@embedded.ufcg.edu.br> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4AD4B677.4000308@embedded.ufcg.edu.br> User-Agent: Mutt/1.5.18 (2008-05-17) X-ERG-MailScanner: Found to be clean X-ERG-MailScanner-From: gerrit@erg.abdn.ac.uk X-Spam-Status: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org | First Patch on TFRC-SP. Please find attached one edit that I made. I added unwinding the initialisation of tfrc_lib in the case where the initialisation of tfrc_sp_lib fails. Unwinding is now done in the reverse order of the steps done during initialisation. --- a/net/dccp/ccid.c +++ b/net/dccp/ccid.c @@ -223,7 +223,7 @@ int __init ccid_initialize_builtins(void err = tfrc_sp_lib_init(); if (err) - return err; + goto unwind_tfrc_lib; for (i = 0; i < ARRAY_SIZE(ccids); i++) { err = ccid_activate(ccids[i]); @@ -235,8 +235,10 @@ int __init ccid_initialize_builtins(void unwind_registrations: while(--i >= 0) ccid_deactivate(ccids[i]); - tfrc_lib_exit(); + tfrc_sp_lib_exit(); +unwind_tfrc_lib: + tfrc_lib_exit(); return err; } @@ -246,6 +248,6 @@ void ccid_cleanup_builtins(void) for (i = 0; i < ARRAY_SIZE(ccids); i++) ccid_deactivate(ccids[i]); - tfrc_lib_exit(); tfrc_sp_lib_exit(); + tfrc_lib_exit(); }