Commit aac17948 authored by Richard Weinberger's avatar Richard Weinberger

ubifs: Check ubifs_wbuf_sync() return code

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: 1e51764a ("UBIFS: add new flash file system")
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 0adb3285
...@@ -1737,8 +1737,11 @@ static void ubifs_remount_ro(struct ubifs_info *c) ...@@ -1737,8 +1737,11 @@ static void ubifs_remount_ro(struct ubifs_info *c)
dbg_save_space_info(c); dbg_save_space_info(c);
for (i = 0; i < c->jhead_cnt; i++) for (i = 0; i < c->jhead_cnt; i++) {
ubifs_wbuf_sync(&c->jheads[i].wbuf); 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_DIRTY);
c->mst_node->flags |= cpu_to_le32(UBIFS_MST_NO_ORPHS); c->mst_node->flags |= cpu_to_le32(UBIFS_MST_NO_ORPHS);
...@@ -1804,8 +1807,11 @@ static void ubifs_put_super(struct super_block *sb) ...@@ -1804,8 +1807,11 @@ static void ubifs_put_super(struct super_block *sb)
int err; int err;
/* Synchronize write-buffers */ /* Synchronize write-buffers */
for (i = 0; i < c->jhead_cnt; i++) for (i = 0; i < c->jhead_cnt; i++) {
ubifs_wbuf_sync(&c->jheads[i].wbuf); err = ubifs_wbuf_sync(&c->jheads[i].wbuf);
if (err)
ubifs_ro_mode(c, err);
}
/* /*
* We are being cleanly unmounted which means the * We are being cleanly unmounted which means the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment