Commit 0f4a2ceb authored by Al Viro's avatar Al Viro

do_dentry_open(): kill inode argument

should've been done as soon as overlayfs stopped messing with fake
paths...
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent af58dc1f
...@@ -902,10 +902,10 @@ static inline int file_get_write_access(struct file *f) ...@@ -902,10 +902,10 @@ static inline int file_get_write_access(struct file *f)
} }
static int do_dentry_open(struct file *f, static int do_dentry_open(struct file *f,
struct inode *inode,
int (*open)(struct inode *, struct file *)) int (*open)(struct inode *, struct file *))
{ {
static const struct file_operations empty_fops = {}; static const struct file_operations empty_fops = {};
struct inode *inode = f->f_path.dentry->d_inode;
int error; int error;
path_get(&f->f_path); path_get(&f->f_path);
...@@ -1047,7 +1047,7 @@ int finish_open(struct file *file, struct dentry *dentry, ...@@ -1047,7 +1047,7 @@ int finish_open(struct file *file, struct dentry *dentry,
BUG_ON(file->f_mode & FMODE_OPENED); /* once it's opened, it's opened */ BUG_ON(file->f_mode & FMODE_OPENED); /* once it's opened, it's opened */
file->f_path.dentry = dentry; file->f_path.dentry = dentry;
return do_dentry_open(file, d_backing_inode(dentry), open); return do_dentry_open(file, open);
} }
EXPORT_SYMBOL(finish_open); EXPORT_SYMBOL(finish_open);
...@@ -1086,7 +1086,7 @@ EXPORT_SYMBOL(file_path); ...@@ -1086,7 +1086,7 @@ EXPORT_SYMBOL(file_path);
int vfs_open(const struct path *path, struct file *file) int vfs_open(const struct path *path, struct file *file)
{ {
file->f_path = *path; file->f_path = *path;
return do_dentry_open(file, d_backing_inode(path->dentry), NULL); return do_dentry_open(file, NULL);
} }
struct file *dentry_open(const struct path *path, int flags, struct file *dentry_open(const struct path *path, int flags,
...@@ -1174,7 +1174,7 @@ struct file *kernel_file_open(const struct path *path, int flags, ...@@ -1174,7 +1174,7 @@ struct file *kernel_file_open(const struct path *path, int flags,
return f; return f;
f->f_path = *path; f->f_path = *path;
error = do_dentry_open(f, d_inode(path->dentry), NULL); error = do_dentry_open(f, NULL);
if (error) { if (error) {
fput(f); fput(f);
f = ERR_PTR(error); f = ERR_PTR(error);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment