diff options
| author | Eric Biggers <ebiggers@google.com> | 2017-11-29 12:43:16 -0800 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2018-01-17 21:48:04 +0100 |
| commit | a0b3ccd9636014664e5dec80a86ef624399c105c (patch) | |
| tree | 98e5c788ed756a241233c66a09f7ff8b8bba7638 /fs/ubifs | |
| parent | 0c1ad5242d4f7c155661449a766e98f0018799ee (diff) | |
| download | linux-a0b3ccd9636014664e5dec80a86ef624399c105c.tar.gz linux-a0b3ccd9636014664e5dec80a86ef624399c105c.tar.bz2 linux-a0b3ccd9636014664e5dec80a86ef624399c105c.zip | |
ubifs: switch to fscrypt_prepare_lookup()
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/dir.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 7bf847d79b4a..a2ea4856e67b 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -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) |