Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5d23b95 authored by Kees Cook's avatar Kees Cook
Browse files

pstore: Clarify context field przs as dprzs 



Since "przs" (persistent ram zones) is a general name in the code now, so
rename the Oops-dump zones to dprzs from przs.

Based on a patch from Nobuhiro Iwamatsu.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent c443a5f3

fs/pstore/ram.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -85,10 +85,10 @@ MODULE_PARM_DESC(ramoops_ecc, 
		"bytes ECC)");

		"bytes ECC)");





struct ramoops_context {

struct ramoops_context {

	struct persistent_ram_zone **przs;

	struct persistent_ram_zone **dprzs;	/* Oops dump zones */

	struct persistent_ram_zone *cprz;

	struct persistent_ram_zone *cprz;	/* Console zone */

	struct persistent_ram_zone **fprzs;

	struct persistent_ram_zone **fprzs;	/* Ftrace zones */

	struct persistent_ram_zone *mprz;

	struct persistent_ram_zone *mprz;	/* PMSG zone */

	phys_addr_t phys_addr;

	phys_addr_t phys_addr;

	unsigned long size;

	unsigned long size;

	unsigned int memtype;

	unsigned int memtype;
@@ -256,7 +256,7 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type, 




	/* Find the next valid persistent_ram_zone for DMESG */

	/* Find the next valid persistent_ram_zone for DMESG */

	while (cxt->dump_read_cnt < cxt->max_dump_cnt && !prz) {

	while (cxt->dump_read_cnt < cxt->max_dump_cnt && !prz) {

		prz = ramoops_get_next_prz(cxt->przs, &cxt->dump_read_cnt,

		prz = ramoops_get_next_prz(cxt->dprzs, &cxt->dump_read_cnt,

					   cxt->max_dump_cnt, id, type,

					   cxt->max_dump_cnt, id, type,

					   PSTORE_TYPE_DMESG, 1);

					   PSTORE_TYPE_DMESG, 1);

		if (!prz_ok(prz))

		if (!prz_ok(prz))
@@ -430,10 +430,10 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type, 
	if (part != 1)

	if (part != 1)

		return -ENOSPC;

		return -ENOSPC;





	if (!cxt->przs)

	if (!cxt->dprzs)

		return -ENOSPC;

		return -ENOSPC;





	prz = cxt->przs[cxt->dump_write_cnt];

	prz = cxt->dprzs[cxt->dump_write_cnt];





	hlen = ramoops_write_kmsg_hdr(prz, compressed);

	hlen = ramoops_write_kmsg_hdr(prz, compressed);

	if (size + hlen > prz->buffer_size)

	if (size + hlen > prz->buffer_size)
@@ -473,7 +473,7 @@ static int ramoops_pstore_erase(enum pstore_type_id type, u64 id, int count, 
	case PSTORE_TYPE_DMESG:

	case PSTORE_TYPE_DMESG:

		if (id >= cxt->max_dump_cnt)

		if (id >= cxt->max_dump_cnt)

			return -EINVAL;

			return -EINVAL;

		prz = cxt->przs[id];

		prz = cxt->dprzs[id];

		break;

		break;

	case PSTORE_TYPE_CONSOLE:

	case PSTORE_TYPE_CONSOLE:

		prz = cxt->cprz;

		prz = cxt->cprz;
@@ -513,11 +513,11 @@ static void ramoops_free_przs(struct ramoops_context *cxt) 
	int i;

	int i;





	/* Free dump PRZs */

	/* Free dump PRZs */

	if (cxt->przs) {

	if (cxt->dprzs) {

		for (i = 0; i < cxt->max_dump_cnt; i++)

		for (i = 0; i < cxt->max_dump_cnt; i++)

			persistent_ram_free(cxt->przs[i]);

			persistent_ram_free(cxt->dprzs[i]);





		kfree(cxt->przs);

		kfree(cxt->dprzs);

		cxt->max_dump_cnt = 0;

		cxt->max_dump_cnt = 0;

	}

	}
@@ -771,7 +771,7 @@ static int ramoops_probe(struct platform_device *pdev) 




	dump_mem_sz = cxt->size - cxt->console_size - cxt->ftrace_size

	dump_mem_sz = cxt->size - cxt->console_size - cxt->ftrace_size

			- cxt->pmsg_size;

			- cxt->pmsg_size;

	err = ramoops_init_przs("dump", dev, cxt, &cxt->przs, &paddr,

	err = ramoops_init_przs("dump", dev, cxt, &cxt->dprzs, &paddr,

				dump_mem_sz, cxt->record_size,

				dump_mem_sz, cxt->record_size,

				&cxt->max_dump_cnt, 0, 0);

				&cxt->max_dump_cnt, 0, 0);

	if (err)

	if (err)