ovl: store real inode pointer in ->i_private

[deliverable/linux.git] / fs / overlayfs / inode.c

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 0598c169ce419fc33b32ffae88f46ac394be6a9a..2bdd3cae0f7171d76464f4e2bc8c1212b23e9a81 100644 (file)
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -117,15 +117,12 @@ static int ovl_getattr(struct vfsmount *mnt, struct dentry *dentry,
 
 int ovl_permission(struct inode *inode, int mask)
 {
-       struct ovl_entry *oe = inode->i_private;
        bool is_upper;
-       struct dentry *realdentry = ovl_entry_real(oe, &is_upper);
-       struct inode *realinode;
+       struct inode *realinode = ovl_inode_real(inode, &is_upper);
        const struct cred *old_cred;
        int err;
 
        /* Careful in RCU walk mode */
-       realinode = d_inode_rcu(realdentry);
        if (!realinode) {
                WARN_ON(!(mask & MAY_NOT_BLOCK));
                return -ECHILD;
@@ -312,7 +309,7 @@ out:
 
 struct posix_acl *ovl_get_acl(struct inode *inode, int type)
 {
-       struct inode *realinode = ovl_inode_real(inode);
+       struct inode *realinode = ovl_inode_real(inode, NULL);
        const struct cred *old_cred;
        struct posix_acl *acl;
 
@@ -412,8 +409,7 @@ static const struct inode_operations ovl_symlink_inode_operations = {
        .update_time    = ovl_update_time,
 };
 
-struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
-                           struct ovl_entry *oe)
+struct inode *ovl_new_inode(struct super_block *sb, umode_t mode)
 {
        struct inode *inode;
 
@@ -424,7 +420,6 @@ struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
        inode->i_ino = get_next_ino();
        inode->i_mode = mode;
        inode->i_flags |= S_NOCMTIME;
-       inode->i_private = oe;
 
        mode &= S_IFMT;
        switch (mode) {