|
@@ -220,20 +220,9 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry,
|
|
|
|
|
|
dbg_gen("'%pd' in dir ino %lu", dentry, dir->i_ino);
|
|
|
|
|
|
- if (ubifs_crypt_is_encrypted(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
|
|
|
- * 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)
|
|
|
- return ERR_PTR(err);
|
|
|
- }
|
|
|
+ err = fscrypt_prepare_lookup(dir, dentry, flags);
|
|
|
+ if (err)
|
|
|
+ return ERR_PTR(err);
|
|
|
|
|
|
err = fscrypt_setup_filename(dir, &dentry->d_name, 1, &nm);
|
|
|
if (err)
|