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

Commit 22d1e6f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 014642cb 67e753ca

fs/ubifs/super.c

+6 −6
Original line number Diff line number Diff line
@@ -1568,6 +1568,12 @@ static int ubifs_remount_rw(struct ubifs_info *c) 
	c->remounting_rw = 1;

	c->ro_mount = 0;



	if (c->space_fixup) {

		err = ubifs_fixup_free_space(c);

		if (err)

			return err;

	}



	err = check_free_space(c);

	if (err)

		goto out;
@@ -1684,12 +1690,6 @@ static int ubifs_remount_rw(struct ubifs_info *c) 
		err = dbg_check_space_info(c);

	}



	if (c->space_fixup) {

		err = ubifs_fixup_free_space(c);

		if (err)

			goto out;

	}



	mutex_unlock(&c->umount_mutex);

	return err;