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.9-rc6' of git://git.infradead.org/linux-ubifs

Pull UBIFS fix from Artem Bityutskiy:
"Make the space fixup feature work in the case when the file-system is
first mounted R/O and then remounted R/W."

* tag 'upstream-3.9-rc6' of git://git.infradead.org/linux-ubifs:
UBIFS: make space fixup work in the remount case

+6 -6
+6 -6
fs/ubifs/super.c
··· 1568 1568 c->remounting_rw = 1; 1569 1569 c->ro_mount = 0; 1570 1570 1571 + if (c->space_fixup) { 1572 + err = ubifs_fixup_free_space(c); 1573 + if (err) 1574 + return err; 1575 + } 1576 + 1571 1577 err = check_free_space(c); 1572 1578 if (err) 1573 1579 goto out; ··· 1688 1682 * because, for example, the old index size was imprecise. 1689 1683 */ 1690 1684 err = dbg_check_space_info(c); 1691 - } 1692 - 1693 - if (c->space_fixup) { 1694 - err = ubifs_fixup_free_space(c); 1695 - if (err) 1696 - goto out; 1697 1685 } 1698 1686 1699 1687 mutex_unlock(&c->umount_mutex);