Merge branch 'overlayfs-af_unix-fix' into overlayfs-linus

2016-06-12 12:05:21 +02:00
parent b581755b1c eb0a4a47ae
commit 30402c8949
2 changed files with 15 additions and 3 deletions
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -575,5 +575,17 @@ static inline struct inode *vfs_select_inode(struct dentry *dentry,
 	return inode;
 }

+/**
+ * d_real_inode - Return the real inode
+ * @dentry: The dentry to query
+ *
+ * If dentry is on an union/overlay, then return the underlying, real inode.
+ * Otherwise return d_inode().
+ */
+static inline struct inode *d_real_inode(struct dentry *dentry)
+{
+	return d_backing_inode(d_real(dentry));
+}
+

 #endif	/* __LINUX_DCACHE_H */