ubifs: remove unnecessary calls to set up directory key (c64cda8a) · Commits · 戴 / test

In ubifs_unlink() and ubifs_rmdir(), remove the call to fscrypt_get_encryption_info() that precedes fscrypt_setup_filename(). This call was unnecessary, because fscrypt_setup_filename() already tries to set up the directory's encryption key. Signed-off-by:

Eric Biggers <ebiggers@google.com> Signed-off-by:

Richard Weinberger <richard@nod.at>

fs/ubifs/dir.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -792,12 +792,6 @@ static int ubifs_unlink(struct inode dir, struct dentry dentry)
		dentry, inode->i_ino,
		inode->i_nlink, dir->i_ino);

		if (ubifs_crypt_is_encrypted(dir)) {
		err = fscrypt_get_encryption_info(dir);
		if (err && err != -ENOKEY)
		return err;
		}

		err = fscrypt_setup_filename(dir, &dentry->d_name, 1, &nm);
		if (err)
		return err;
		@@ -902,12 +896,6 @@ static int ubifs_rmdir(struct inode dir, struct dentry dentry)
		if (err)
		return err;

		if (ubifs_crypt_is_encrypted(dir)) {
		err = fscrypt_get_encryption_info(dir);
		if (err && err != -ENOKEY)
		return err;
		}

		err = fscrypt_setup_filename(dir, &dentry->d_name, 1, &nm);
		if (err)
		return err;

Admin message