diff options
author | Joel Fernandes (Google) <joel@joelfernandes.org> | 2018-11-03 16:38:16 -0700 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2018-12-03 16:52:35 -0800 |
commit | f0f23e5469dc80b482d985898a930be0e249a162 (patch) | |
tree | 076e7a3a11b3112838dabc039a8bc6fa65eec6bc /fs/pstore/ram.c | |
parent | 4af62a6423d0ad98e3eee2bec4305dde8deefefe (diff) | |
download | linux-stable-f0f23e5469dc80b482d985898a930be0e249a162.tar.gz linux-stable-f0f23e5469dc80b482d985898a930be0e249a162.tar.bz2 linux-stable-f0f23e5469dc80b482d985898a930be0e249a162.zip |
pstore: Map PSTORE_TYPE_* to strings
In later patches we will need to map types to names, so create a
constant table for that which can also be used in different parts of
old and new code. This saves the type in the PRZ which will be useful
in later patches.
Instead of having an explicit PSTORE_TYPE_UNKNOWN, just use ..._MAX.
This includes removing the now redundant filename templates which can use
a single format string. Also, there's no reason to limit the "is it still
compressed?" test to only PSTORE_TYPE_DMESG when building the pstorefs
filename. Records are zero-initialized, so a backend would need to have
explicitly set compressed=1.
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Co-developed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'fs/pstore/ram.c')
-rw-r--r-- | fs/pstore/ram.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 10ac4d23c423..b174d0fc009f 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -611,6 +611,7 @@ static int ramoops_init_przs(const char *name, goto fail; } *paddr += zone_sz; + prz_ar[i]->type = pstore_name_to_type(name); } *przs = prz_ar; @@ -650,6 +651,7 @@ static int ramoops_init_prz(const char *name, } *paddr += sz; + (*prz)->type = pstore_name_to_type(name); return 0; } @@ -785,7 +787,7 @@ static int ramoops_probe(struct platform_device *pdev) dump_mem_sz = cxt->size - cxt->console_size - cxt->ftrace_size - cxt->pmsg_size; - err = ramoops_init_przs("dump", dev, cxt, &cxt->dprzs, &paddr, + err = ramoops_init_przs("dmesg", dev, cxt, &cxt->dprzs, &paddr, dump_mem_sz, cxt->record_size, &cxt->max_dump_cnt, 0, 0); if (err) |