OSDN Git Service

f2fs: switch to fscrypt_prepare_lookup()
authorEric Biggers <ebiggers@google.com>
Wed, 29 Nov 2017 20:35:31 +0000 (12:35 -0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 8 Feb 2018 01:53:40 +0000 (17:53 -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/namei.c

index e7fd30e..6e2c78c 100644 (file)
@@ -357,20 +357,9 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,
 
        trace_f2fs_lookup_start(dir, dentry, flags);
 
-       if (f2fs_encrypted_inode(dir)) {
-               err = fscrypt_get_encryption_info(dir);
-
-               /*
-                * DCACHE_ENCRYPTED_WITH_KEY is set if the dentry is
-                * created while the directory was encrypted and we
-                * don't have access to the key.
-                */
-               if (fscrypt_has_encryption_key(dir))
-                       fscrypt_set_encrypted_dentry(dentry);
-               fscrypt_set_d_op(dentry);
-               if (err && err != -ENOKEY)
-                       goto out;
-       }
+       err = fscrypt_prepare_lookup(dir, dentry, flags);
+       if (err)
+               goto out;
 
        if (dentry->d_name.len > F2FS_NAME_LEN) {
                err = -ENAMETOOLONG;