lkml.org 
[lkml]   [2018]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/13] get rid of 'opened' in path_openat() and the helpers downstream
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    unused now

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    fs/namei.c | 22 ++++++++--------------
    1 file changed, 8 insertions(+), 14 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index 189ead589811..00436749003b 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -3002,8 +3002,7 @@ static int may_o_create(const struct path *dir, struct dentry *dentry, umode_t m
    static int atomic_open(struct nameidata *nd, struct dentry *dentry,
    struct path *path, struct file *file,
    const struct open_flags *op,
    - int open_flag, umode_t mode,
    - int *opened)
    + int open_flag, umode_t mode)
    {
    struct dentry *const DENTRY_NOT_SET = (void *) -1UL;
    struct inode *dir = nd->path.dentry->d_inode;
    @@ -3071,14 +3070,11 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry,
    * specified then a negative dentry may be returned.
    *
    * An error code is returned otherwise.
    - *
    - * FILE_CREATE will be set in @*opened if the dentry was created and will be
    - * cleared otherwise prior to returning.
    */
    static int lookup_open(struct nameidata *nd, struct path *path,
    struct file *file,
    const struct open_flags *op,
    - bool got_write, int *opened)
    + bool got_write)
    {
    struct dentry *dir = nd->path.dentry;
    struct inode *dir_inode = dir->d_inode;
    @@ -3153,7 +3149,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,

    if (dir_inode->i_op->atomic_open) {
    error = atomic_open(nd, dentry, path, file, op, open_flag,
    - mode, opened);
    + mode);
    if (unlikely(error == -ENOENT) && create_error)
    error = create_error;
    return error;
    @@ -3206,8 +3202,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
    * Handle the last step of open()
    */
    static int do_last(struct nameidata *nd,
    - struct file *file, const struct open_flags *op,
    - int *opened)
    + struct file *file, const struct open_flags *op)
    {
    struct dentry *dir = nd->path.dentry;
    int open_flag = op->open_flag;
    @@ -3273,7 +3268,7 @@ static int do_last(struct nameidata *nd,
    inode_lock(dir->d_inode);
    else
    inode_lock_shared(dir->d_inode);
    - error = lookup_open(nd, &path, file, op, got_write, opened);
    + error = lookup_open(nd, &path, file, op, got_write);
    if (open_flag & O_CREAT)
    inode_unlock(dir->d_inode);
    else
    @@ -3418,7 +3413,7 @@ EXPORT_SYMBOL(vfs_tmpfile);

    static int do_tmpfile(struct nameidata *nd, unsigned flags,
    const struct open_flags *op,
    - struct file *file, int *opened)
    + struct file *file)
    {
    struct dentry *child;
    struct path path;
    @@ -3465,7 +3460,6 @@ static struct file *path_openat(struct nameidata *nd,
    {
    const char *s;
    struct file *file;
    - int opened = 0;
    int error;

    file = get_empty_filp();
    @@ -3475,7 +3469,7 @@ static struct file *path_openat(struct nameidata *nd,
    file->f_flags = op->open_flag;

    if (unlikely(file->f_flags & __O_TMPFILE)) {
    - error = do_tmpfile(nd, flags, op, file, &opened);
    + error = do_tmpfile(nd, flags, op, file);
    goto out2;
    }

    @@ -3490,7 +3484,7 @@ static struct file *path_openat(struct nameidata *nd,
    return ERR_CAST(s);
    }
    while (!(error = link_path_walk(s, nd)) &&
    - (error = do_last(nd, file, op, &opened)) > 0) {
    + (error = do_last(nd, file, op)) > 0) {
    nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL);
    s = trailing_symlink(nd);
    if (IS_ERR(s)) {
    --
    2.11.0
    \
     
     \ /
      Last update: 2018-06-08 20:51    [W:3.361 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site