lkml.org 
[lkml]   [2014]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 5/8] fs/9p: One function call less in v9fs_vfs_atomic_open_dotl() after error detection
    From: Markus Elfring <elfring@users.sourceforge.net>
    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 <elfring@users.sourceforge.net>
    ---
    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


    \
     
     \ /
      Last update: 2014-12-28 22:01    [W:4.026 / U:2.972 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site