diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2018-06-08 13:43:47 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-07-12 10:04:21 -0400 |
| commit | 3ec2eef116e900099edc6d31a1a0423166e2906d (patch) | |
| tree | f1c673c6122a94a8911fe9949a60b57d5ebe028c /fs/namei.c | |
| parent | 44907d79002466049fdbb8ef15730d185e0808b4 (diff) | |
| download | linux-3ec2eef116e900099edc6d31a1a0423166e2906d.tar.gz linux-3ec2eef116e900099edc6d31a1a0423166e2906d.tar.bz2 linux-3ec2eef116e900099edc6d31a1a0423166e2906d.zip | |
get rid of 'opened' in path_openat() and the helpers downstream
unused now
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/fs/namei.c b/fs/namei.c index 1da272bf8ed3..6def3e148f90 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3036,8 +3036,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; @@ -3105,14 +3104,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; @@ -3187,7 +3183,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; @@ -3240,8 +3236,7 @@ out_dput: * 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; @@ -3307,7 +3302,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 @@ -3452,7 +3447,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; @@ -3499,7 +3494,6 @@ static struct file *path_openat(struct nameidata *nd, { const char *s; struct file *file; - int opened = 0; int error; file = alloc_empty_file(op->open_flag, current_cred()); @@ -3507,7 +3501,7 @@ static struct file *path_openat(struct nameidata *nd, return file; if (unlikely(file->f_flags & __O_TMPFILE)) { - error = do_tmpfile(nd, flags, op, file, &opened); + error = do_tmpfile(nd, flags, op, file); goto out2; } @@ -3522,7 +3516,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)) { |