From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752472AbbGENeG (ORCPT ); Sun, 5 Jul 2015 09:34:06 -0400 Received: from mout.web.de ([212.227.17.11]:60274 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751089AbbGENeA (ORCPT ); Sun, 5 Jul 2015 09:34:00 -0400 Message-ID: <55993243.8080006@users.sourceforge.net> Date: Sun, 05 Jul 2015 15:33:55 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Joel Becker , Mark Fasheh , ocfs2-devel@oss.oracle.com CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 05/11] ocfs2: Less error log repetition in ocfs2_begin_truncate_log_recovery() References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <5455FC05.4010606@users.sourceforge.net> <55992DF0.5030205@users.sourceforge.net> In-Reply-To: <55992DF0.5030205@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Z1uH0BzA5rQ4a/OPjy8rrtpgcej0WjGxPwvZgsdEYod1qft1OHj UogufNeEfM79JD1ON5etI3GtkSDL1m8x0T1MbwE5FmEcQj2xeInizvRRcNh1r8rSweq1mGV cRbl5gKZ4Ic+QD9ptzUxJfamPtb1TnFF6Q4lpV1hmyyKoySPwFpjoRyDSjHywPGW8A9sxfE voC8SdY/3V0d+9jkA4MTQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:WYuyAvlorCM=:9jgyt8Go4PFXA7PwnbhVia /wN74Gu4BzR5W2LRmeVjKo7vCjekTL9B2RApDePNt7E69BUqRDBZKaZicGZueURG9IoAO2QJV MUavEt2C9fIsMWDryUGuV+azjZUj8EWZTJtl4FxFmT3ptW8ub7UGGJJb7JDjuSdXhdq0xUPDS Gc6/WmfWWFYfhoOhQ0o4W2eO0352IqSWaa4tkmJ3ebXsF3rq4tMpKOYcgy6GAOgLeWQw13m+A u/fIt6Uvsz7gXavuRQdmLXXqlc8NaxFaEGDH6f8tkwg1ed3XThPphYi2QxKGg4QXRoLcIq8/s i8ZvIIABH1P7E6lkpfcZgmoAGEtDoR5mNrtynrzZf2vEgz6YTjQr7joAKo/ck5ebe3H7DBuUj BhZKVEbci/Djwb6amriFZcGTkoHyJju5TLjyFp8Mc9WU1t6MliesbXT0kW9EYRq1UkctKeOWE vpM/trReYZaVmVI/a5nG3IrnT1fR9DT5n2hPnuWpZ4wF1qc1IR/4CDPjIudgbgni/mAlmEcA9 tl05h6OTI7scfMBQc2z9mjYSxmKiYqoLIdrFbe2fYyR/1mphKeWevrpHMgnqVzX/Y/iWG/BBH vPJWskDNoTK4h2JxiC0B68u/vX5qZwgELkEX5unMcXxqdsDeFE7mGkOxZ06ePuwZ0Uw15tD13 HME4pPj9L9ZqveCpy70fbeZdjOUaYQNThuSZ9m+Iyq91kHxds/JEpJmzSXRPdlchs9Jk= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 4 Jul 2015 17:23:08 +0200 Delete three direct calls of the mlog_errno() function within ocfs2_begin_truncate_log_recovery(). A single logging call can be sufficient. Drop initialisation for the variables "tl_inode" and "tl_bh" then. Signed-off-by: Markus Elfring --- fs/ocfs2/alloc.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index f36dcaa..59e639e 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -6147,8 +6147,8 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb, struct ocfs2_dinode **tl_copy) { int status; - struct inode *tl_inode = NULL; - struct buffer_head *tl_bh = NULL; + struct inode *tl_inode; + struct buffer_head *tl_bh; struct ocfs2_dinode *di; struct ocfs2_truncate_log *tl; @@ -6157,10 +6157,8 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb, trace_ocfs2_begin_truncate_log_recovery(slot_num); status = ocfs2_get_truncate_log_info(osb, slot_num, &tl_inode, &tl_bh); - if (status < 0) { - mlog_errno(status); - goto bail; - } + if (status < 0) + goto log_error; di = (struct ocfs2_dinode *) tl_bh->b_data; @@ -6176,7 +6174,6 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb, *tl_copy = kmalloc(tl_bh->b_size, GFP_KERNEL); if (!(*tl_copy)) { status = -ENOMEM; - mlog_errno(status); goto bail; } @@ -6191,7 +6188,6 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb, ocfs2_compute_meta_ecc(osb->sb, tl_bh->b_data, &di->i_check); status = ocfs2_write_block(osb, tl_bh, INODE_CACHE(tl_inode)); if (status < 0) { - mlog_errno(status); goto bail; } } @@ -6200,9 +6196,12 @@ bail: iput(tl_inode); brelse(tl_bh); - if (status < 0 && (*tl_copy)) { - kfree(*tl_copy); - *tl_copy = NULL; + if (status < 0) { + if (*tl_copy) { + kfree(*tl_copy); + *tl_copy = NULL; + } +log_error: mlog_errno(status); } -- 2.4.5