lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 004/196] ubifs: Check ubifs_wbuf_sync() return code
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Richard Weinberger <richard@nod.at>

    commit aac17948a7ce01fb60b9ee6cf902967a47b3ce26 upstream.

    If ubifs_wbuf_sync() fails we must not write a master node with the
    dirty marker cleared.
    Otherwise it is possible that in case of an IO error while syncing we
    mark the filesystem as clean and UBIFS refuses to recover upon next
    mount.

    Cc: <stable@vger.kernel.org>
    Fixes: 1e51764a3c2a ("UBIFS: add new flash file system")
    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ubifs/super.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    --- a/fs/ubifs/super.c
    +++ b/fs/ubifs/super.c
    @@ -1737,8 +1737,11 @@ static void ubifs_remount_ro(struct ubif

    dbg_save_space_info(c);

    - for (i = 0; i < c->jhead_cnt; i++)
    - ubifs_wbuf_sync(&c->jheads[i].wbuf);
    + for (i = 0; i < c->jhead_cnt; i++) {
    + err = ubifs_wbuf_sync(&c->jheads[i].wbuf);
    + if (err)
    + ubifs_ro_mode(c, err);
    + }

    c->mst_node->flags &= ~cpu_to_le32(UBIFS_MST_DIRTY);
    c->mst_node->flags |= cpu_to_le32(UBIFS_MST_NO_ORPHS);
    @@ -1804,8 +1807,11 @@ static void ubifs_put_super(struct super
    int err;

    /* Synchronize write-buffers */
    - for (i = 0; i < c->jhead_cnt; i++)
    - ubifs_wbuf_sync(&c->jheads[i].wbuf);
    + for (i = 0; i < c->jhead_cnt; i++) {
    + err = ubifs_wbuf_sync(&c->jheads[i].wbuf);
    + if (err)
    + ubifs_ro_mode(c, err);
    + }

    /*
    * We are being cleanly unmounted which means the

    \
     
     \ /
      Last update: 2018-04-22 18:16    [W:2.587 / U:0.504 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site