Commit c88ac00c authored Mar 29, 2011 by Artem Bityutskiy

UBIFS: fix assertion warnings



This patch fixes UBIFS assertion warnings like:

UBIFS assert failed in ubifs_leb_unmap at 135 (pid 29365)
Pid: 29365, comm: integck Tainted: G          I 2.6.37-ubi-2.6+ #34
Call Trace:
 [<ffffffffa047c663>] ubifs_lpt_init+0x95e/0x9ee [ubifs]
 [<ffffffffa04623a7>] ubifs_remount_fs+0x2c7/0x762 [ubifs]
 [<ffffffff810f066e>] do_remount_sb+0xb6/0x101
 [<ffffffff81106ff4>] ? do_mount+0x191/0x78e
 [<ffffffff811070bb>] do_mount+0x258/0x78e
 [<ffffffff810da1e8>] ? alloc_pages_current+0xa2/0xc5
 [<ffffffff81107674>] sys_mount+0x83/0xbd
 [<ffffffff81009a12>] system_call_fastpath+0x16/0x1b

They happen when we re-mount from R/O mode to R/W mode. While
re-mounting, we write to the media, but we still have the c->ro_mount
flag set. The fix is very simple - just clear the flag before
starting re-mounting R/W.

These warnings are caused by the following commit:
2ef13294

For -stable guys: this bug was introduced in 2.6.38, this is materieal
for 2.6.38-stable.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Cc: stable@kernel.org [2.6.38]

parent 54acbaaa

fs/ubifs/super.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1568,6 +1568,7 @@ static int ubifs_remount_rw(struct ubifs_info *c)
		mutex_lock(&c->umount_mutex);
		dbg_save_space_info(c);
		c->remounting_rw = 1;
		c->ro_mount = 0;

		err = check_free_space(c);
		if (err)
		@@ -1676,13 +1677,13 @@ static int ubifs_remount_rw(struct ubifs_info *c)
		}

		dbg_gen("re-mounted read-write");
		c->ro_mount = 0;
		c->remounting_rw = 0;
		err = dbg_check_space_info(c);
		mutex_unlock(&c->umount_mutex);
		return err;

		out:
		c->ro_mount = 1;
		vfree(c->orph_buf);
		c->orph_buf = NULL;
		if (c->bgt) {

Admin message