summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2018-01-17 13:12:42 -0500
committerRichard Weinberger <richard@nod.at>2018-04-04 17:41:44 -0400
commitaac17948a7ce01fb60b9ee6cf902967a47b3ce26 (patch)
tree2795f998c8824203475027fcd5d99c4babadd1bc /fs
parent0adb32858b0bddf4ada5f364a84ed60b196dbcda (diff)
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: 1e51764a3c2a ("UBIFS: add new flash file system") Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/super.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index b16ef162344a..6c397a389105 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1737,8 +1737,11 @@ static void ubifs_remount_ro(struct ubifs_info *c)
1737 1737
1738 dbg_save_space_info(c); 1738 dbg_save_space_info(c);
1739 1739
1740 for (i = 0; i < c->jhead_cnt; i++) 1740 for (i = 0; i < c->jhead_cnt; i++) {
1741 ubifs_wbuf_sync(&c->jheads[i].wbuf); 1741 err = ubifs_wbuf_sync(&c->jheads[i].wbuf);
1742 if (err)
1743 ubifs_ro_mode(c, err);
1744 }
1742 1745
1743 c->mst_node->flags &= ~cpu_to_le32(UBIFS_MST_DIRTY); 1746 c->mst_node->flags &= ~cpu_to_le32(UBIFS_MST_DIRTY);
1744 c->mst_node->flags |= cpu_to_le32(UBIFS_MST_NO_ORPHS); 1747 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 int err; 1807 int err;
1805 1808
1806 /* Synchronize write-buffers */ 1809 /* Synchronize write-buffers */
1807 for (i = 0; i < c->jhead_cnt; i++) 1810 for (i = 0; i < c->jhead_cnt; i++) {
1808 ubifs_wbuf_sync(&c->jheads[i].wbuf); 1811 err = ubifs_wbuf_sync(&c->jheads[i].wbuf);
1812 if (err)
1813 ubifs_ro_mode(c, err);
1814 }
1809 1815
1810 /* 1816 /*
1811 * We are being cleanly unmounted which means the 1817 * We are being cleanly unmounted which means the