Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0b3ccd9 authored by Eric Biggers's avatar Eric Biggers Committed by Richard Weinberger
Browse files

ubifs: switch to fscrypt_prepare_lookup() 



Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 0c1ad524

fs/ubifs/dir.c

+3 −14
Original line number Diff line number Diff line
@@ -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)

	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)