From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752046AbaL1UqY (ORCPT ); Sun, 28 Dec 2014 15:46:24 -0500 Received: from mout.web.de ([212.227.15.4]:64737 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751776AbaL1UqV (ORCPT ); Sun, 28 Dec 2014 15:46:21 -0500 Message-ID: <54A06C0E.4030105@users.sourceforge.net> Date: Sun, 28 Dec 2014 21:46:06 +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 5/8] fs/9p: One function call less in v9fs_vfs_atomic_open_dotl() 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:nbS40BIWIgaYGMZq228HUIQZPENB5BP+X5uce+oY+hDH1nISc/A vjmZ3J0zf8PzpZGZmDNRjFQWOQsD9g5N2NlSNJ87U3NEFnP9ubWQP5QyEfZVoeBrJ+ny61z OZg+Bk48p3a41pTB2yySROcLvzHT3IJlo6JlMYKc5E3eXJjm6Ibf1E1sBesSWNEHYB6L4wR dLuDvI4Pe15Qx7qio5Y7A== 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 09:29:40 +0100 The p9_client_clunk() function was called in three cases by the v9fs_vfs_atomic_open_dotl() function during error handling even if the passed variable "fid" contained a null pointer. This implementation detail could be improved by the adjustment of jump targets. Let us delete also an unnecessary variable assignment there. Signed-off-by: Markus Elfring --- fs/9p/vfs_inode_dotl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c index 3611b0f..ce1f5bb 100644 --- a/fs/9p/vfs_inode_dotl.c +++ b/fs/9p/vfs_inode_dotl.c @@ -297,14 +297,14 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry, if (err) { p9_debug(P9_DEBUG_VFS, "Failed to get acl values in creat %d\n", err); - goto error; + goto err_clunk_old_fid; } err = p9_client_create_dotl(ofid, name, v9fs_open_to_dotl_flags(flags), mode, gid, &qid); if (err < 0) { p9_debug(P9_DEBUG_VFS, "p9_client_open_dotl failed in creat %d\n", err); - goto error; + goto err_clunk_old_fid; } v9fs_invalidate_inode_attr(dir); @@ -313,8 +313,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry, if (IS_ERR(fid)) { err = PTR_ERR(fid); p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n", err); - fid = NULL; - goto error; + goto err_clunk_old_fid; } inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb); if (IS_ERR(inode)) { -- 2.2.1