diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-05-23 03:39:43 +0300 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-05-24 07:10:36 +0300 |
| commit | b82a6ea6ec39f1b5ef949a38e334eed0dc29f4d1 (patch) | |
| tree | 4d75aeb20818b0a8aa93319547b4a6fa7735abe2 /fs/f2fs | |
| parent | 6afae6336ac9c19b5956c003e882b1ee4bca2a9d (diff) | |
| download | linux-b82a6ea6ec39f1b5ef949a38e334eed0dc29f4d1.tar.xz | |
f2fs: 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().
This f2fs copy of this code was also broken in that it wouldn't actually
have failed if the key was in fact unavailable.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: David Gstir <david@sigma-star.at>
Acked-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/file.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 8ccbfe53c03c..30fbb4ce6a73 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -415,14 +415,6 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma) struct inode *inode = file_inode(file); int err; - if (f2fs_encrypted_inode(inode)) { - err = fscrypt_get_encryption_info(inode); - if (err) - return 0; - if (!f2fs_encrypted_inode(inode)) - return -ENOKEY; - } - /* we don't need to use inline_data strictly */ err = f2fs_convert_inline_inode(inode); if (err) |