OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ensure unique filenames in pstore 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUP/b6AAoJEKurIx+X31iBnikP/3yUNHty6FpLJ/u0liqnzBIP
 DgD4BR+EwObVdMG4a4M5QcR9euoNdg532ywyoyWtRKpX7czpicu+Q60uHGx5OKwd
 fCMVibMTv+kQ/r+UMQ/J9+B3CyZXwRzHOMlcfT/yxZdYG+o+LZkfVBfY5kn9DQFK
 I+c3LZLwqOJhuz8/yUO9azFSo+r+QvtoC/WApW28iAKXjtCss9Vi2NN9i4yEqsQ2
 BelbuiiI6DYYVP7yBWIIJJlUO9xV/JSJx8tfA0Qyp5JYaRApzZ6kZpn1vnlB3JJ3
 prkWxqy9RkQQIcsUn/tCxiX8TBoXyNR4Vb8722ACGHIUBQp+kzyRi/9xfeZoi8E3
 2PXRIX6QJSy0++YSX6wVVbYSq3DrfQoFByNwR1uvtFxIzzMoRmNuvIwWlHe/Yew5
 QQ8U1UiYnBm/I8SH0GCd/vbwB1Ar9QV3JhbgUg6tzFurj6EBRBZqAz9UYThROarZ
 LSPJ8l+D2x0vkRaFEekO0C+OMXvv3if82cqcYdx042KM07RpjN71ceoY2PZIUJK4
 jUJKAfA2h8ymGTTG/tWNiUBkjnPXkMBXMi8YWjYHJ2QdYJauagwbS6jRgPJ3eZ/I
 muVezr9vHLnIxSv0yLmcLkBepACQgjA0mIXn24XV0W/5/5Uz/BQyAUoz2h71m1ak
 bxeX5HWwp0/p0kkvSOgk
 =mFre
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2014-10-18 13:25:03 -07:00
parent 4869447d21 d4bf205da6
commit 8ccf863f09
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/inode.c
View File

@ -320,10 +320,10 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
compressed ? ".enc.z" : "");
break;
case PSTORE_TYPE_CONSOLE:
sprintf(name, "console-%s", psname);
sprintf(name, "console-%s-%lld", psname, id);
break;
case PSTORE_TYPE_FTRACE:
sprintf(name, "ftrace-%s", psname);
sprintf(name, "ftrace-%s-%lld", psname, id);
break;
case PSTORE_TYPE_MCE:
sprintf(name, "mce-%s-%lld", psname, id);