Pull pstore fix from Tony Luck: "Ensure unique filenames in pstore" * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: pstore: Fix duplicate {console,ftrace}-efi entries
Unified · Split
| @@ -320,10 +320,10 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count, · 319 unmodified lines | |||
| 320 | compressed ? ".enc.z" : ""); | 320 | compressed ? ".enc.z" : ""); |
| 321 | break; | 321 | break; |
| 322 | case PSTORE_TYPE_CONSOLE: | 322 | case PSTORE_TYPE_CONSOLE: |
| 323 | sprintf(name, "console-%s", psname); | 323 | sprintf(name, "console-%s-%lld", psname, id); |
| 324 | break; | 324 | break; |
| 325 | case PSTORE_TYPE_FTRACE: | 325 | case PSTORE_TYPE_FTRACE: |
| 326 | sprintf(name, "ftrace-%s", psname); | 326 | sprintf(name, "ftrace-%s-%lld", psname, id); |
| 327 | break; | 327 | break; |
| 328 | case PSTORE_TYPE_MCE: | 328 | case PSTORE_TYPE_MCE: |
| 329 | sprintf(name, "mce-%s-%lld", psname, id); | 329 | sprintf(name, "mce-%s-%lld", psname, id); |