Skip to content

Commit

Permalink
ubifs: Check ubifs_wbuf_sync() return code
Browse files Browse the repository at this point in the history
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: <[email protected]>
Fixes: 1e51764 ("UBIFS: add new flash file system")
Signed-off-by: Richard Weinberger <[email protected]>
  • Loading branch information
richardweinberger committed Apr 4, 2018
1 parent 0adb328 commit aac1794
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions fs/ubifs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1737,8 +1737,11 @@ static void ubifs_remount_ro(struct ubifs_info *c)

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);
Expand Down Expand Up @@ -1804,8 +1807,11 @@ static void ubifs_put_super(struct super_block *sb)
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
Expand Down

0 comments on commit aac1794

Please sign in to comment.