tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 17934162 85efc72a

+6 -2
+6 -2
fs/ubifs/sb.c
··· 718 718 lnum = ubifs_next_log_lnum(c, lnum); 719 719 } 720 720 721 - /* Fixup the current log head */ 722 - err = fixup_leb(c, c->lhead_lnum, c->lhead_offs); 721 + /* 722 + * Fixup the log head which contains the only a CS node at the 723 + * beginning. 724 + */ 725 + err = fixup_leb(c, c->lhead_lnum, 726 + ALIGN(UBIFS_CS_NODE_SZ, c->min_io_size)); 723 727 if (err) 724 728 goto out; 725 729