openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pstore update for v5.12-rc1 

- Fix a CONFIG typo (Jiri Bohac)
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEpcP2jyKd1g9yPm4TiXL039xtwCYFAmAuz1gACgkQiXL039xt
 wCbHmA/8Dweb4NELHwpMb+7CS0YTtQSkDsZT8PeKnIl3UaoZKQdTcolCm/20wkDx
 Pvh25zu9bCwut9bYtAiMSKTsfvOIJAxLiPpLNtyuukx/MtGo6SUVaxRZ2Cm1HL+c
 uQBCgBXnMGznJPOiU0O6/AH9QFr+HQMuXjRHuIBabNOnat93s4sSSefbSAaCUlFS
 TOTCEIUpTS3w3s0KUGuVsQ8M/OLg/in5JZ+Hbvfq7dejHi/5lQlBDkd8juqzapOL
 BCW4s45NIrnXOFqImFnDx7M6vXB8nt/D8Wf/70Qv7tQgqbFjU7qz0r4HEwGAlghG
 DYr5kr5R58tmqyYPuswJKgxdJi8DvmVI9XMdmST2XRIkgQpFfF9Fi5JrNHKXPDHV
 mFIC58ts17BmAE32jEglYgndYg86YkX+uNYJ/9mZ5s0LEYHzQE1AlNwz7+zlKMQJ
 ByiSs+TRDEWvintB1BXtba5W/IE1uqkieZp4NFmwIddvTGj9DCz0ST3eLhyJX7Jd
 RBR3HH83SOR1T1Nis+rIMSMurgSzMo+XH4w2G0+Bo3KAujqyZAnxu/TczTeEtvR1
 5fbpVG7KBtKOLsCPHGAzOP5YRj/Y1M7toAIANZpgStn5rqgQIvdS2JiWFfYs4MWU
 fdGAO+mTfuXpfZwUt8IVFZ0cC56z6mJ8RRUEHhk+M0N7CdD2Jps=
 =zSj6
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-02-21 10:27:13 -08:00
parent f7b36dc5cb 19d8e9149c
commit f02361639a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/pstore/platform.c
View File

@ -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. */