Patch "vfs: add vfs_select_inode() helper" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message May 15, 2016

Subsystems (2)

Stable branch VFS

lore

Share & tools

lore

[email protected]

author maintainer Applied

2016-05-15 00:25 UTC #0 lore raw

This is a note to let you know that I've just added the patch titled

vfs: add vfs_select_inode() helper

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
vfs-add-vfs_select_inode-helper.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 54d5ca871e72f2bb172ec9323497f01cd5091ec7 Mon Sep 17 00:00:00 2001

From: Miklos Szeredi <[email protected]>
Date: Wed, 11 May 2016 01:16:37 +0200
Subject: vfs: add vfs_select_inode() helper

From: Miklos Szeredi <[email protected]>

commit 54d5ca871e72f2bb172ec9323497f01cd5091ec7 upstream.

Signed-off-by Miklos Szeredi <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 fs/open.c              |   12 ++++--------
 include/linux/dcache.h |   12 ++++++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

fs/open.c +4 -8

@@ -840,16 +840,12 @@ EXPORT_SYMBOL(file_path);
 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);
 
-	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);
-	}
+	if (IS_ERR(inode))
+		return PTR_ERR(inode);
 
+	file->f_path = *path;
 	return do_dentry_open(file, inode, NULL, cred);
 }

include/linux/dcache.h +12 -0

@@ -592,4 +592,16 @@ static inline struct dentry *d_real(stru
 		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 */

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/vfs-rename-check-backing-inode-being-equal.patch queue-4.5/vfs-add-vfs_select_inode-helper.patch queue-4.5/atomic_open-fix-the-handling-of-create_error.patch