Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux (8ccf863f) · Commits · 戴 / test

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

fs/pstore/inode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);