diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2016-07-27 11:36:03 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2016-07-27 11:36:03 +0200 |
| commit | 1b91dbdd2938a0102fea2d8853073159f2b08deb (patch) | |
| tree | 6c1c54e4b15a1efbcd15a4d68d6366c71abf9979 /fs/open.c | |
| parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) | |
| parent | 0cac643c102c0632dc2cc81e2490b0fec1cac0af (diff) | |
Merge branch 'd_real' into overlayfs-next
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/open.c b/fs/open.c index 93ae3cdee4ab..bf66cf1a9f5c 100644 --- a/fs/open.c +++ b/fs/open.c @@ -840,13 +840,13 @@ EXPORT_SYMBOL(file_path); int vfs_open(const struct path *path, struct file *file, const struct cred *cred) { - struct inode *inode = vfs_select_inode(path->dentry, file->f_flags); + struct dentry *dentry = d_real(path->dentry, NULL, file->f_flags); - if (IS_ERR(inode)) - return PTR_ERR(inode); + if (IS_ERR(dentry)) + return PTR_ERR(dentry); file->f_path = *path; - return do_dentry_open(file, inode, NULL, cred); + return do_dentry_open(file, d_backing_inode(dentry), NULL, cred); } struct file *dentry_open(const struct path *path, int flags, |