From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751530AbaK2GpK (ORCPT ); Sat, 29 Nov 2014 01:45:10 -0500 Received: from mout.web.de ([212.227.17.12]:65372 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750999AbaK2GpH (ORCPT ); Sat, 29 Nov 2014 01:45:07 -0500 Message-ID: <54796B5E.5040707@users.sourceforge.net> Date: Sat, 29 Nov 2014 07:44:46 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Julia Lawall , OGAWA Hirofumi CC: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, trivial@kernel.org, Coccinelle Subject: [PATCH v2] fs-fat: Less function calls in fat_fill_super() 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> <5467B12C.4010602@users.sourceforge.net> In-Reply-To: Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:VZt3Poxh9itNBVpEHaVI5VQK2X3oJCX8WvScYf0aP9p4TpDSQS2 CAXqkeGDv4FQDlgKS1ltkNoPOwR4qXJMKNRiMbenA6OY7bOSuZKcw1DJxOhAX3ZEKdCXvUX j4OkVBtkDD/YDYIzXEX+u9aHOzhivsg0ylrCtcKPf/VuRf/dCzhiJwRqJKzX6+vYhzo1J+3 cQMlGTJIVrzo+MDkxtK6w== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 29 Nov 2014 07:37:34 +0100 The iput() function was called in an inefficient way by the implementation of the fat_fill_super() function in case of an allocation failure. The corresponding source code was improved by deletion of two unnecessary null pointer checks and a few adjustments for jump labels. Signed-off-by: Markus Elfring --- fs/fat/inode.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 756aead..a39afe8 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -1716,20 +1716,20 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, fsinfo_inode = new_inode(sb); if (!fsinfo_inode) - goto out_fail; + goto fsinfo_inode_failure; fsinfo_inode->i_ino = MSDOS_FSINFO_INO; sbi->fsinfo_inode = fsinfo_inode; insert_inode_hash(fsinfo_inode); root_inode = new_inode(sb); if (!root_inode) - goto out_fail; + goto failure_exit; root_inode->i_ino = MSDOS_ROOT_INO; root_inode->i_version = 1; error = fat_read_root(root_inode); if (error < 0) { iput(root_inode); - goto out_fail; + goto failure_exit; } error = -ENOMEM; insert_inode_hash(root_inode); @@ -1737,7 +1737,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, sb->s_root = d_make_root(root_inode); if (!sb->s_root) { fat_msg(sb, KERN_ERR, "get root inode failed"); - goto out_fail; + goto failure_exit; } if (sbi->options.discard) { @@ -1756,11 +1756,13 @@ out_invalid: if (!silent) fat_msg(sb, KERN_INFO, "Can't find a valid FAT filesystem"); +failure_exit: + iput(fsinfo_inode); + +fsinfo_inode_failure: + iput(fat_inode); + out_fail: - if (fsinfo_inode) - iput(fsinfo_inode); - if (fat_inode) - iput(fat_inode); unload_nls(sbi->nls_io); unload_nls(sbi->nls_disk); if (sbi->options.iocharset != fat_default_iocharset) -- 2.1.3