ext4: switch to fscrypt_file_open()

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index b1da660ac3bcf97c8cd799fcc6823a23666c8ea5..ffe9144088f8e0041049319a805304d7abbe1b51 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -364,7 +364,6 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
        struct super_block *sb = inode->i_sb;
        struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
        struct vfsmount *mnt = filp->f_path.mnt;
-       struct dentry *dir;
        struct path path;
        char buf[64], *cp;
        int ret;
@@ -404,25 +403,11 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
                        ext4_journal_stop(handle);
                }
        }
-       if (ext4_encrypted_inode(inode)) {
-               ret = fscrypt_get_encryption_info(inode);
-               if (ret)
-                       return -EACCES;
-               if (!fscrypt_has_encryption_key(inode))
-                       return -ENOKEY;
-       }
 
-       dir = dget_parent(file_dentry(filp));
-       if (ext4_encrypted_inode(d_inode(dir)) &&
-                       !fscrypt_has_permitted_context(d_inode(dir), inode)) {
-               ext4_warning(inode->i_sb,
-                            "Inconsistent encryption contexts: %lu/%lu",
-                            (unsigned long) d_inode(dir)->i_ino,
-                            (unsigned long) inode->i_ino);
-               dput(dir);
-               return -EPERM;
-       }
-       dput(dir);
+       ret = fscrypt_file_open(inode, filp);
+       if (ret)
+               return ret;
+
        /*
         * Set up the jbd2_inode if we are opening the inode for
         * writing and the journal is present