From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752606AbbGENmw (ORCPT ); Sun, 5 Jul 2015 09:42:52 -0400 Received: from mout.web.de ([212.227.17.11]:49234 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751089AbbGENmn (ORCPT ); Sun, 5 Jul 2015 09:42:43 -0400 Message-ID: <55993450.9090102@users.sourceforge.net> Date: Sun, 05 Jul 2015 15:42:40 +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 11/11] ocfs2: One function call less in ocfs2_journal_shutdown() from input checks 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:eHU8QIo/ok/AxGx67z6zRXNYTp2pjH0xOqoZFKtTH3YGpR1Oqka 5kW3/L86w9CWOXqx1+5Z8P1NPU8rccCZvzBe3J02cCxotCQrO5bnMkLy1dEJay/jEK6XM0D HiATLSogK9PjKT8Jy7XWa1MHjbHdnE17OV16L+Uh4Fksj9pOzIu5wX2Ubv1iVCAoE4Ao2uI 4Y9jMVXL+4g4dWppX+Q9w== X-UI-Out-Filterresults: notjunk:1;V01:K0:7xSQQHnZCC8=:Fl9olLr8CiIaNP2bkTW9Wx XSup0DHcQ4gcS3uhi7dfMji2GfC2v9EymKg+QbzKH9DyZlVRvujOm5FwH45WmOIDg9hTd++J6 i6xH925da5EYwSpBtzA/jpSp9ImYVFHMBcsD2IOCyQwhkDjPqm+X/JQeHrq0RvlpQPK0zaGES ZS4YRahH/x6TrX6ApAdhxfu6UECfBeVPDiafrS/2H0vnaelA7grvDAilKFMDRoWMmxLx+VgmR Gqm2YjtW2r8d8Qelcvo2cekYeqloYMM4UL96AgA9xDxm1qnQ8qsZVcGX4fug5RVJqwG2q2jTJ 35JfIfJk2IHdLZPuH3h6zu8QTiolj0ArI9fKIVuXx8f3b+ZuwpCt3vDGld1ll+ZaoHMYtrqPt RsP1iZ13c0BBP2SjBgxFc9b4g5A5k8t/pD1EKa+Z4XlDRQUO/qWPQbWavLV8TN5pr3azWumfK AN5A5dWRKxdHadTEm23n/BSZZnpXodGrXjLlkfQiX4TVsoOjHInjLty0zbniZD+zieqeUfhvY Uk4mZk17OUjcz4HaLJRbWlawc2iLnBimIIqlwXG6Yj97O4zRMIre9AsP6vSkoFfpWL7hZe/+p ZQMFU1i20lF+tZuZhDGidY5ykwOI7GOcgfg0ntyUxkLTHLuPO0EWDky1jvWPAZ5LuYMZONHin EZ7DwHxTocR69N5BN7Xu3SoU/jr4Fn+9ah4w9rhmEi1bXMGbL6PElT+V0jWkstnYi7Bc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 5 Jul 2015 14:54:33 +0200 The iput() function was called in one case by the ocfs2_journal_shutdown() function during input parameter validation even if the passed variable contained still a null pointer. * Return directly if received values indicate that at the beginning. * Delete the unnecessary jump label "done". * Drop unnecessary initialisations for the variables "inode", "journal" and "num_running_trans" then. Signed-off-by: Markus Elfring --- fs/ocfs2/journal.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 7bb50f4..f13e6fdb 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -951,22 +951,20 @@ static int ocfs2_journal_toggle_dirty(struct ocfs2_super *osb, */ void ocfs2_journal_shutdown(struct ocfs2_super *osb) { - struct ocfs2_journal *journal = NULL; + struct ocfs2_journal *journal; int status = 0; - struct inode *inode = NULL; - int num_running_trans = 0; + struct inode *inode; + int num_running_trans; BUG_ON(!osb); journal = osb->journal; if (!journal) - goto done; - - inode = journal->j_inode; - + return; if (journal->j_state != OCFS2_JOURNAL_LOADED) - goto done; + return; + inode = journal->j_inode; /* need to inc inode use count - jbd2_journal_destroy will iput. */ if (!igrab(inode)) BUG(); @@ -1025,7 +1023,6 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb) journal->j_state = OCFS2_JOURNAL_FREE; // up_write(&journal->j_trans_barrier); -done: iput(inode); } -- 2.4.5