Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17934162 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'upstream-3.5-rc8' of git://git.infradead.org/linux-ubifs

Pull UBIFS free space fix-up bugfix from Artem Bityutskiy:
 "It's been reported already twice recently:

    http://lists.infradead.org/pipermail/linux-mtd/2012-May/041408.html
    http://lists.infradead.org/pipermail/linux-mtd/2012-June/042422.html

  and we finally have the fix.  I am quite confident the fix is correct
  because I could reproduce the problem with nandsim and verify the fix.
  It was also verified by Iwo (the reporter).

  I am also confident that this is OK to merge the fix so late because
  this patch affects only the fixup functionality, which is not used by
  most users."

* tag 'upstream-3.5-rc8' of git://git.infradead.org/linux-ubifs:
  UBIFS: fix a bug in empty space fix-up
parents 85efc72a c6727932
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -718,8 +718,12 @@ static int fixup_free_space(struct ubifs_info *c)
		lnum = ubifs_next_log_lnum(c, lnum);
	}

	/* Fixup the current log head */
	err = fixup_leb(c, c->lhead_lnum, c->lhead_offs);
	/*
	 * Fixup the log head which contains the only a CS node at the
	 * beginning.
	 */
	err = fixup_leb(c, c->lhead_lnum,
			ALIGN(UBIFS_CS_NODE_SZ, c->min_io_size));
	if (err)
		goto out;