From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751986AbaL1UmF (ORCPT ); Sun, 28 Dec 2014 15:42:05 -0500 Received: from mout.web.de ([212.227.15.3]:60709 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751776AbaL1UmC (ORCPT ); Sun, 28 Dec 2014 15:42:02 -0500 Message-ID: <54A06B0E.4080709@users.sourceforge.net> Date: Sun, 28 Dec 2014 21:41:50 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Eric Van Hensbergen , Latchesar Ionkov , Ron Minnich , v9fs-developer@lists.sourceforge.net CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 2/8] fs/9p: One function call less in v9fs_create() 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> <54A01326.3050306@users.sourceforge.net> In-Reply-To: <54A01326.3050306@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Rk8defMfoNQ741BJqNpa2PjvFzyI3JS39hnCGPrQfZGH6w6Vh8W CmTQyof/783UsbP3bEgXBbhsqXFHl7y8KlPRWogp99vO7Ul7SqpOxjBXKk8xbOLnO2AKn9N w+uVzZ0wmfIrrnGuC4cX32ptBliaRZLKyyns+PXEwiRJXX+rTxxjoihyjXLfqIKuyh0iWSZ lk/UDfqYIjAOgo31XCAqA== 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: Sun, 28 Dec 2014 08:28:51 +0100 The p9_client_clunk() function was called in two cases by the v9fs_create() function during error handling even if the passed variable "fid" contained a null pointer. This implementation detail could be improved by the introduction of another jump label. Signed-off-by: Markus Elfring --- fs/9p/vfs_inode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index a787d4c..81b945a 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -672,7 +672,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir, err = p9_client_fcreate(ofid, name, perm, mode, extension); if (err < 0) { p9_debug(P9_DEBUG_VFS, "p9_client_fcreate failed %d\n", err); - goto error; + goto ofid_clunk; } if (!(perm & P9_DMLINK)) { @@ -682,8 +682,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir, err = PTR_ERR(fid); p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n", err); - fid = NULL; - goto error; + goto ofid_clunk; } /* * instantiate inode and assign the unopened fid to the dentry @@ -693,16 +692,17 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir, err = PTR_ERR(inode); p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n", err); - goto error; + goto fid_clunk; } v9fs_fid_add(dentry, fid); d_instantiate(dentry, inode); } return ofid; -error: - p9_client_clunk(ofid); +fid_clunk: p9_client_clunk(fid); +ofid_clunk: + p9_client_clunk(ofid); return ERR_PTR(err); } -- 2.2.1