Skip to content

Commit

Permalink
Merge tag 'pstore-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/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
  • Loading branch information
torvalds committed Feb 21, 2021
2 parents f7b36dc + 19d8e91 commit f023616
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/pstore/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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. */
Expand Down

0 comments on commit f023616

Please sign in to comment.