ubifs: Check ubifs_wbuf_sync() return code (aac17948) · Commits · 戴 / test

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: ("UBIFS: add new flash file system") Signed-off-by:

Richard Weinberger <richard@nod.at>

fs/ubifs/super.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -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);
		@@ -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

Admin message