diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-11-29 12:35:28 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-02-07 17:53:36 -0800 |
| commit | 101c6a96ad1c69011659bb1ddc9bad2b534aac17 (patch) | |
| tree | 98ae49bb0eda9cbcb08d27537f9bc6e79dd7c140 | |
| parent | 6d025237a1f8f205c08efdb80ba991bf41df98b1 (diff) | |
f2fs: switch to fscrypt_file_open()
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/file.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index e2990f67a4ee..81f298ac4cb2 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -474,22 +474,10 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma) static int f2fs_file_open(struct inode *inode, struct file *filp) { - struct dentry *dir; + int err = fscrypt_file_open(inode, filp); - if (f2fs_encrypted_inode(inode)) { - int 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 (f2fs_encrypted_inode(d_inode(dir)) && - !fscrypt_has_permitted_context(d_inode(dir), inode)) { - dput(dir); - return -EPERM; - } - dput(dir); + if (err) + return err; return dquot_file_open(inode, filp); } |