lkml.org 
[lkml]   [2012]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/21] vfs: do_last(): clean up labels
    Date
    From: Miklos Szeredi <mszeredi@suse.cz>

    Reported-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    ---
    fs/namei.c | 10 +++++-----
    1 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index 55f5f27..e57cec2 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2454,13 +2454,13 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
    error = -EISDIR;
    goto exit;
    }
    - goto ok;
    + goto finish_open;
    case LAST_BIND:
    error = complete_walk(nd);
    if (error)
    return ERR_PTR(error);
    audit_inode(pathname, dir);
    - goto ok;
    + goto finish_open;
    }

    if (!(open_flag & O_CREAT)) {
    @@ -2517,7 +2517,7 @@ retry_lookup:
    will_truncate = 0;
    acc_mode = MAY_OPEN;
    path_to_nameidata(path, nd);
    - goto common;
    + goto finish_open_created;
    }

    /*
    @@ -2589,7 +2589,7 @@ finish_lookup:
    if ((nd->flags & LOOKUP_DIRECTORY) && !nd->inode->i_op->lookup)
    goto exit;
    audit_inode(pathname, nd->path.dentry);
    -ok:
    +finish_open:
    if (!S_ISREG(nd->inode->i_mode))
    will_truncate = 0;

    @@ -2599,7 +2599,7 @@ ok:
    goto exit;
    want_write = 1;
    }
    -common:
    +finish_open_created:
    error = may_open(&nd->path, acc_mode, open_flag);
    if (error)
    goto exit;
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-06-05 16:01    [W:0.045 / U:29.388 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site