Merge "fs/crypto: do not clear encryption key before inode is updated"

fs/crypto/keyinfo.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -606,8 +606,6 @@ int fscrypt_get_encryption_info(struct inode *inode)
		if (res)
		goto out;

		memzero_explicit(crypt_info->ci_raw_key,
		sizeof(crypt_info->ci_raw_key));
		do_ice:
		if (cmpxchg(&inode->i_crypt_info, NULL, crypt_info) == NULL)
		crypt_info = NULL;