diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-18 16:25:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-18 16:25:03 -0400 |
| commit | 8ccf863f09bbff209b124cbd90644c0b75b8fefd (patch) | |
| tree | 180f1a8cf8bd735cc30ce330825f1f1d3d186067 /fs | |
| parent | 4869447d21738f9d5bfdf2e9644bcc62db288d88 (diff) | |
| parent | d4bf205da618bbd0b038e404d646f14e76915718 (diff) | |
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pstore/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index 192297b0090d..fafb7a02a5d6 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c | |||
| @@ -320,10 +320,10 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count, | |||
| 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); |