From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752964AbbGENi7 (ORCPT ); Sun, 5 Jul 2015 09:38:59 -0400 Received: from mout.web.de ([212.227.17.11]:61242 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751325AbbGENiw (ORCPT ); Sun, 5 Jul 2015 09:38:52 -0400 Message-ID: <5599335F.6020309@users.sourceforge.net> Date: Sun, 05 Jul 2015 15:38:39 +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 09/11] ocfs2: One function call less in ocfs2_trylock_journal() after error detection 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:qk/4ZNdcvKm7rcsfbycA7j2JBqntUlLIPSVrIRN51oRc+8IbLX+ SSkxFzGap0BGdoQZPDx/nocAPvUTJ/R58Ux0MlJS/dj3NTzCsL6HQN9rFCrnqLieznjF1Wm C5kGqRCRvHGfT7L2hj7+wMbUn2nNviqDBjrtiTclcDb8gbz/Ei/YIoOvJSiVSVxJGz+2QtP +IqB/pUfC4IG2odaDAsMQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:qcjUJsWJOiA=:EiJvyFRNGShE4uu1IHbDUE iJS25XPgV2HleCLa9RUhrq+1R61BXByMrzi5pC4zSgMwgRGzx4SCYPUBB1b2X6UZPiUuk/0y3 iO02LELcHdzbYxab0JE5prlWIFrfcCd9yCRrjJy20RjcBXYwmPhj0HgXxq3EZgvuOMJ0kSEOS 8nnc9v5SKRkaQfGqoc464jxR6He/pwZh90U0V3uxm7nL0tTL4XJqyn53nOkWWulXUhQtacm9A l5ySBTYbQpYRpxoLYeWob5zYHTeXnY1Fom3B0BiEqzJ6D3xpx8SHBqegiXwJV4S2nchoBwlZR qrYvVGvtGhSwENFpUDepAaKNP0Qx688yUAnQAGortHPD8adMIBZY/1A+37OOoB53HPe19TLxg O2JPSSoqhx2uUrmwfumSHd/CTF5fPnY4VA34YUZSTE+GTcO6R9CHa9KPdjT9YW5CFgmXFqtCd ImVTbh979oTjgctj0ixkGh9aTEoqT+Qwf5XONFVwXwOlv235wPjqMkXYQJjiXOt/WGJP5qXsb xaK8VQ4WJQ7wsDJknoVvE/hC8Xo8L/16aHlxRMxZkVyD70Jkt9oEWPiikIZXk2ZhjdJokbcbB lsCLzqNupm4Muoraf52JruQAwCbhaUwiTxu23j4sTA2P6DRZS3J2Ns+5RKeaAzeCKQKldWC+d 97mlqC3Ya7LHfW+f4d4/3kqC0h683sAzhQVlb+a5m5CYychcGlNVQIocpVIg4U95E7AU= 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 22:34:43 +0200 The iput() function was called in one case by the ocfs2_trylock_journal() function during error handling even if the passed variable "inode" contained still a null pointer. * Return directly if a call of the ocfs2_get_system_file_inode() function failed at the beginning. * Rename a jump label according to the Linux coding style convention. Signed-off-by: Markus Elfring --- fs/ocfs2/journal.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index c644997..c343e36 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -1749,21 +1749,18 @@ static int ocfs2_trylock_journal(struct ocfs2_super *osb, int slot_num) { int status, flags; - struct inode *inode = NULL; + struct inode *inode; inode = ocfs2_get_system_file_inode(osb, JOURNAL_SYSTEM_INODE, slot_num); if (inode == NULL) { mlog(ML_ERROR, "access error\n"); - status = -EACCES; - goto bail; + return -EACCES; } if (is_bad_inode(inode)) { mlog(ML_ERROR, "access error (bad inode)\n"); - iput(inode); - inode = NULL; status = -EACCES; - goto bail; + goto put_inode; } SET_INODE_JOURNAL(inode); @@ -1772,11 +1769,11 @@ static int ocfs2_trylock_journal(struct ocfs2_super *osb, if (status < 0) { if (status != -EAGAIN) mlog_errno(status); - goto bail; + goto put_inode; } ocfs2_inode_unlock(inode, 1); -bail: +put_inode: iput(inode); return status; } -- 2.4.5