diff options
| author | Richard Weinberger <richard@nod.at> | 2018-01-17 19:12:42 +0100 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-05-22 21:36:32 -0400 |
| commit | 3e913fca69feb7279e0a8dd71988fe06d2019045 (patch) | |
| tree | 4506585ec280e7126195c92b61311d34d3ebf3bc | |
| parent | 27c07e3cdc0bb455de146b776bb6f3d19850ccd2 (diff) | |
ubifs: Check ubifs_wbuf_sync() return code
[ Upstream commit aac17948a7ce01fb60b9ee6cf902967a47b3ce26 ]
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: Sasha Levin <alexander.levin@microsoft.com>
| -rw-r--r-- | fs/ubifs/super.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 75e6f04bb795..48ab0c462f21 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1724,8 +1724,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); @@ -1791,8 +1794,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 |