2020-09-03 03:44:10

by Mark Tomlinson

Subject: [PATCH] mtd: mtdoops: Don't write panic data twice

If calling mtdoops_write, don't also schedule work to be done later.

Although this appears to not be causing an issue, possibly because the
scheduled work will never get done, it is confusing.

Fixes: 016c1291ce70 ("mtd: mtdoops: do not use mtd->panic_write directly")
Signed-off-by: Mark Tomlinson <[email protected]>
---
drivers/mtd/mtdoops.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index 4ced68be7ed7..774970bfcf85 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -279,12 +279,13 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper,
kmsg_dump_get_buffer(dumper, true, cxt->oops_buf + MTDOOPS_HEADER_SIZE,
record_size - MTDOOPS_HEADER_SIZE, NULL);

- /* Panics must be written immediately */
- if (reason != KMSG_DUMP_OOPS)
+ if (reason != KMSG_DUMP_OOPS) {
+ /* Panics must be written immediately */
mtdoops_write(cxt, 1);
-
- /* For other cases, schedule work to write it "nicely" */
- schedule_work(&cxt->work_write);
+ } else {
+ /* For other cases, schedule work to write it "nicely" */
+ schedule_work(&cxt->work_write);
+ }
}

static void mtdoops_notify_add(struct mtd_info *mtd)
--
2.28.0

2020-09-11 16:52:19

by Miquel Raynal

Subject: Re: [PATCH] mtd: mtdoops: Don't write panic data twice

On Thu, 2020-09-03 at 03:42:17 UTC, Mark Tomlinson wrote:
> If calling mtdoops_write, don't also schedule work to be done later.
>
> Although this appears to not be causing an issue, possibly because the
> scheduled work will never get done, it is confusing.
>
> Fixes: 016c1291ce70 ("mtd: mtdoops: do not use mtd->panic_write directly")
> Signed-off-by: Mark Tomlinson <[email protected]>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Miquel