mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

pstore/ram: Give proper names to dump-related variables

Browse source 
We're about to add support for other message types, so let's rename
some variables to not be confused later.

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Anton Vorontsov 2012-05-26 06:20:20 -07:00 committed by Greg Kroah-Hartman
parent f29e5956ae
commit cac2eb7b58
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
fs/pstore/ram.c
View file

@ -68,9 +68,9 @@ struct ramoops_context {
size_t record_size; size_t record_size;
int dump_oops; int dump_oops;
bool ecc; bool ecc;
unsigned int count; unsigned int max_dump_cnt;
unsigned int max_count; unsigned int dump_write_cnt;
unsigned int read_count; unsigned int dump_read_cnt;
struct pstore_info pstore; struct pstore_info pstore;
}; };
@ -81,7 +81,7 @@ static int ramoops_pstore_open(struct pstore_info *psi)
{ {
struct ramoops_context *cxt = psi->data; struct ramoops_context *cxt = psi->data;
cxt->read_count = 0; cxt->dump_read_cnt = 0;
return 0; return 0;
} }
@ -94,10 +94,10 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
struct ramoops_context *cxt = psi->data; struct ramoops_context *cxt = psi->data;
struct persistent_ram_zone *prz; struct persistent_ram_zone *prz;
if (cxt->read_count >= cxt->max_count) if (cxt->dump_read_cnt >= cxt->max_dump_cnt)
return -EINVAL; return -EINVAL;
*id = cxt->read_count++; *id = cxt->dump_read_cnt++;
prz = cxt->przs[*id]; prz = cxt->przs[*id];
/* Only supports dmesg output so far. */ /* Only supports dmesg output so far. */
@ -141,7 +141,7 @@ static int ramoops_pstore_write(enum pstore_type_id type,
size_t size, struct pstore_info *psi) size_t size, struct pstore_info *psi)
{ {
struct ramoops_context *cxt = psi->data; struct ramoops_context *cxt = psi->data;
struct persistent_ram_zone *prz = cxt->przs[cxt->count]; struct persistent_ram_zone *prz = cxt->przs[cxt->dump_write_cnt];
size_t hlen; size_t hlen;
/* Currently ramoops is designed to only store dmesg dumps. */ /* Currently ramoops is designed to only store dmesg dumps. */
@ -172,7 +172,7 @@ static int ramoops_pstore_write(enum pstore_type_id type,
size = prz->buffer_size - hlen; size = prz->buffer_size - hlen;
persistent_ram_write(prz, cxt->pstore.buf, size); persistent_ram_write(prz, cxt->pstore.buf, size);
cxt->count = (cxt->count + 1) % cxt->max_count; cxt->dump_write_cnt = (cxt->dump_write_cnt + 1) % cxt->max_dump_cnt;
return 0; return 0;
} }
@ -182,7 +182,7 @@ static int ramoops_pstore_erase(enum pstore_type_id type, u64 id,
{ {
struct ramoops_context *cxt = psi->data; struct ramoops_context *cxt = psi->data;
if (id >= cxt->max_count) if (id >= cxt->max_dump_cnt)
return -EINVAL; return -EINVAL;
persistent_ram_free_old(cxt->przs[id]); persistent_ram_free_old(cxt->przs[id]);
@ -213,7 +213,7 @@ static int __init ramoops_probe(struct platform_device *pdev)
/* Only a single ramoops area allowed at a time, so fail extra /* Only a single ramoops area allowed at a time, so fail extra
* probes. * probes.
*/ */
if (cxt->max_count) if (cxt->max_dump_cnt)
goto fail_out; goto fail_out;
if (!pdata->mem_size || !pdata->record_size) { if (!pdata->mem_size || !pdata->record_size) {
@ -239,22 +239,22 @@ static int __init ramoops_probe(struct platform_device *pdev)
goto fail_out; goto fail_out;
} }
cxt->max_count = pdata->mem_size / pdata->record_size; cxt->max_dump_cnt = pdata->mem_size / pdata->record_size;
cxt->count = 0; cxt->dump_read_cnt = 0;
cxt->size = pdata->mem_size; cxt->size = pdata->mem_size;
cxt->phys_addr = pdata->mem_address; cxt->phys_addr = pdata->mem_address;
cxt->record_size = pdata->record_size; cxt->record_size = pdata->record_size;
cxt->dump_oops = pdata->dump_oops; cxt->dump_oops = pdata->dump_oops;
cxt->ecc = pdata->ecc; cxt->ecc = pdata->ecc;
cxt->przs = kzalloc(sizeof(*cxt->przs) * cxt->max_count, GFP_KERNEL); cxt->przs = kzalloc(sizeof(*cxt->przs) * cxt->max_dump_cnt, GFP_KERNEL);
if (!cxt->przs) { if (!cxt->przs) {
err = -ENOMEM; err = -ENOMEM;
dev_err(dev, "failed to initialize a prz array\n"); dev_err(dev, "failed to initialize a prz array\n");
goto fail_out; goto fail_out;
} }
for (i = 0; i < cxt->max_count; i++) { for (i = 0; i < cxt->max_dump_cnt; i++) {
size_t sz = cxt->record_size; size_t sz = cxt->record_size;
phys_addr_t start = cxt->phys_addr + sz * i; phys_addr_t start = cxt->phys_addr + sz * i;
@ -293,7 +293,7 @@ static int __init ramoops_probe(struct platform_device *pdev)
pr_info("attached 0x%lx@0x%llx (%ux0x%zx), ecc: %s\n", pr_info("attached 0x%lx@0x%llx (%ux0x%zx), ecc: %s\n",
cxt->size, (unsigned long long)cxt->phys_addr, cxt->size, (unsigned long long)cxt->phys_addr,
cxt->max_count, cxt->record_size, cxt->max_dump_cnt, cxt->record_size,
ramoops_ecc ? "on" : "off"); ramoops_ecc ? "on" : "off");
return 0; return 0;
@ -302,7 +302,7 @@ static int __init ramoops_probe(struct platform_device *pdev)
kfree(cxt->pstore.buf); kfree(cxt->pstore.buf);
fail_clear: fail_clear:
cxt->pstore.bufsize = 0; cxt->pstore.bufsize = 0;
cxt->max_count = 0; cxt->max_dump_cnt = 0;
fail_przs: fail_przs:
for (i = 0; cxt->przs[i]; i++) for (i = 0; cxt->przs[i]; i++)
persistent_ram_free(cxt->przs[i]); persistent_ram_free(cxt->przs[i]);
@ -321,7 +321,7 @@ static int __exit ramoops_remove(struct platform_device *pdev)
iounmap(cxt->virt_addr); iounmap(cxt->virt_addr);
release_mem_region(cxt->phys_addr, cxt->size); release_mem_region(cxt->phys_addr, cxt->size);
cxt->max_count = 0; cxt->max_dump_cnt = 0;
/* TODO(kees): When pstore supports unregistering, call it here. */ /* TODO(kees): When pstore supports unregistering, call it here. */
kfree(cxt->pstore.buf); kfree(cxt->pstore.buf);