Commit f0236163 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pstore-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull pstore fix from Kees Cook:
 "Fix a CONFIG typo (Jiri Bohac)"

* tag 'pstore-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore: Fix typo in compression option name
parents f7b36dc5 19d8e914

fs/pstore/platform.c

+2 −2
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static int pstore_compress(const void *in, void *out, 
{

	int ret;



	if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION))

	if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS))

		return -EINVAL;



	ret = crypto_comp_compress(tfm, in, inlen, out, &outlen);
@@ -671,7 +671,7 @@ static void decompress_record(struct pstore_record *record) 
	int unzipped_len;

	char *unzipped, *workspace;



	if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION) || !record->compressed)

	if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS) || !record->compressed)

		return;



	/* Only PSTORE_TYPE_DMESG support compression. */