Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull trivial pstore update from Tony Luck:
"Couple of pstore cleanups"
It turns out that the kmemdup() conversion ends up being undone by the
fact that the memory block also needed the ecc information (see commit
bd08ec33b5c2: "pstore/ram: Restore ecc information block"), so all that
remains after merging is the error return code change.
* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore/ram: fix error return code in ramoops_probe()
fs: pstore: Replaced calls to kmalloc and memcpy with kmemdup
+2
+2
fs/pstore/ram.c
+2
fs/pstore/ram.c
···
438
438
pr_err("memory size too small, minimum is %zu\n",
439
439
cxt->console_size + cxt->record_size +
440
440
cxt->ftrace_size);
441
+
err = -EINVAL;
441
442
goto fail_cnt;
442
443
}
443
444
···
456
455
spin_lock_init(&cxt->pstore.buf_lock);
457
456
if (!cxt->pstore.buf) {
458
457
pr_err("cannot allocate pstore buffer\n");
458
+
err = -ENOMEM;
459
459
goto fail_clear;
460
460
}
461
461