diff options
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 23 |
1 files changed, 21 insertions, 2 deletions
| @@ -823,8 +823,7 @@ struct file *dentry_open(const struct path *path, int flags, | |||
| 823 | f = get_empty_filp(); | 823 | f = get_empty_filp(); |
| 824 | if (!IS_ERR(f)) { | 824 | if (!IS_ERR(f)) { |
| 825 | f->f_flags = flags; | 825 | f->f_flags = flags; |
| 826 | f->f_path = *path; | 826 | error = vfs_open(path, f, cred); |
| 827 | error = do_dentry_open(f, NULL, cred); | ||
| 828 | if (!error) { | 827 | if (!error) { |
| 829 | /* from now on we need fput() to dispose of f */ | 828 | /* from now on we need fput() to dispose of f */ |
| 830 | error = open_check_o_direct(f); | 829 | error = open_check_o_direct(f); |
| @@ -841,6 +840,26 @@ struct file *dentry_open(const struct path *path, int flags, | |||
| 841 | } | 840 | } |
| 842 | EXPORT_SYMBOL(dentry_open); | 841 | EXPORT_SYMBOL(dentry_open); |
| 843 | 842 | ||
| 843 | /** | ||
| 844 | * vfs_open - open the file at the given path | ||
| 845 | * @path: path to open | ||
| 846 | * @filp: newly allocated file with f_flag initialized | ||
| 847 | * @cred: credentials to use | ||
| 848 | */ | ||
| 849 | int vfs_open(const struct path *path, struct file *filp, | ||
| 850 | const struct cred *cred) | ||
| 851 | { | ||
| 852 | struct inode *inode = path->dentry->d_inode; | ||
| 853 | |||
| 854 | if (inode->i_op->dentry_open) | ||
| 855 | return inode->i_op->dentry_open(path->dentry, filp, cred); | ||
| 856 | else { | ||
| 857 | filp->f_path = *path; | ||
| 858 | return do_dentry_open(filp, NULL, cred); | ||
| 859 | } | ||
| 860 | } | ||
| 861 | EXPORT_SYMBOL(vfs_open); | ||
| 862 | |||
| 844 | static inline int build_open_flags(int flags, umode_t mode, struct open_flags *op) | 863 | static inline int build_open_flags(int flags, umode_t mode, struct open_flags *op) |
| 845 | { | 864 | { |
| 846 | int lookup_flags = 0; | 865 | int lookup_flags = 0; |
