commit 54d5ca871e72f2bb172ec9323497f01cd5091ec7
author Miklos Szeredi <mszeredi@redhat.com> Wed May 11 01:16:37 2016 +0200
committer Al Viro <viro@zeniv.linux.org.uk> Tue May 10 23:55:01 2016 -0400
tree 1fc2a5f3017793f70f32c88bc9fdbd8107ca7a99
parent 44549e8f5eea4e0a41b487b63e616cb089922b99

vfs: add vfs_select_inode() helper

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Cc: <stable@vger.kernel.org> # v4.2+

fs/open.c

diff --git a/fs/open.c b/fs/open.c
index 17cb6b1..081d3d6 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -840,16 +840,12 @@
 int vfs_open(const struct path *path, struct file *file,
 	     const struct cred *cred)
 {
-	struct dentry *dentry = path->dentry;
-	struct inode *inode = dentry->d_inode;
+	struct inode *inode = vfs_select_inode(path->dentry, file->f_flags);
+
+	if (IS_ERR(inode))
+		return PTR_ERR(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))
-			return PTR_ERR(inode);
-	}
-
 	return do_dentry_open(file, inode, NULL, cred);
 }