ext4: don't bother checking for encryption key in ->mmap()

Since only an open file can be mmap'ed, and we only allow open()ing an
encrypted file when its key is available, there is no need to check for
the key again before permitting each mmap().

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 02ce7e7bbdf5ba4da0db50e50d8d4cab49cde4a3..736538911f009e5d742895482e79bf2e66447bca 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -345,13 +345,6 @@ static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma)
        if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
                return -EIO;
 
-       if (ext4_encrypted_inode(inode)) {
-               int err = fscrypt_get_encryption_info(inode);
-               if (err)
-                       return 0;
-               if (!fscrypt_has_encryption_key(inode))
-                       return -ENOKEY;
-       }
        file_accessed(file);
        if (IS_DAX(file_inode(file))) {
                vma->vm_ops = &ext4_dax_vm_ops;