lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 057/112] mtd: mtdoops: Dont write panic data twice
    Date
    From: Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>

    [ Upstream commit c1cf1d57d1492235309111ea6a900940213a9166 ]

    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 <mark.tomlinson@alliedtelesis.co.nz>
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Link: https://lore.kernel.org/linux-mtd/20200903034217.23079-1-mark.tomlinson@alliedtelesis.co.nz
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 97bb8f6304d4f..09165eaac7a15 100644
    --- a/drivers/mtd/mtdoops.c
    +++ b/drivers/mtd/mtdoops.c
    @@ -313,12 +313,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.25.1


    \
     
     \ /
      Last update: 2020-10-27 15:39    [W:4.263 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site