vfs: add vfs_select_inode() helper

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Cc: <stable@vger.kernel.org> # v4.2+
This commit is contained in:
Miklos Szeredi 2016-05-11 01:16:37 +02:00 committed by Al Viro
parent 44549e8f5e
commit 54d5ca871e
2 changed files with 16 additions and 8 deletions

View File

@ -840,16 +840,12 @@ EXPORT_SYMBOL(file_path);
int vfs_open(const struct path *path, struct file *file, int vfs_open(const struct path *path, struct file *file,
const struct cred *cred) const struct cred *cred)
{ {
struct dentry *dentry = path->dentry; struct inode *inode = vfs_select_inode(path->dentry, file->f_flags);
struct inode *inode = dentry->d_inode;
file->f_path = *path;
if (dentry->d_flags & DCACHE_OP_SELECT_INODE) {
inode = dentry->d_op->d_select_inode(dentry, file->f_flags);
if (IS_ERR(inode)) if (IS_ERR(inode))
return PTR_ERR(inode); return PTR_ERR(inode);
}
file->f_path = *path;
return do_dentry_open(file, inode, NULL, cred); return do_dentry_open(file, inode, NULL, cred);
} }

View File

@ -565,4 +565,16 @@ static inline struct dentry *d_real(struct dentry *dentry)
return dentry; return dentry;
} }
static inline struct inode *vfs_select_inode(struct dentry *dentry,
unsigned open_flags)
{
struct inode *inode = d_inode(dentry);
if (inode && unlikely(dentry->d_flags & DCACHE_OP_SELECT_INODE))
inode = dentry->d_op->d_select_inode(dentry, open_flags);
return inode;
}
#endif /* __LINUX_DCACHE_H */ #endif /* __LINUX_DCACHE_H */