OSDN Git Service

f2fs: switch to fscrypt_file_open()
authorEric Biggers <ebiggers@google.com>
Wed, 29 Nov 2017 20:35:28 +0000 (12:35 -0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Wed, 3 Jan 2018 03:27:28 +0000 (19:27 -0800)
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/file.c

index 84a011a..ebe55d4 100644 (file)
@@ -472,22 +472,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);
 }