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

Commit b221337a authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBIFS: fix bogus assertion 



Empty journal head LEBs are accounted as taken empty as well, so
the GC LEB does not have to be the only taken empty LEB when
nounting/remounting.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent f55aa591

fs/ubifs/super.c

+8 −4
Original line number Diff line number Diff line
@@ -1318,11 +1318,15 @@ static int mount_ubifs(struct ubifs_info *c) 
		else {

			c->need_recovery = 0;

			ubifs_msg("recovery completed");

			/* GC LEB has to be empty and taken at this point */

			ubifs_assert(c->lst.taken_empty_lebs == 1);

			/*

			 * GC LEB has to be empty and taken at this point. But

			 * the journal head LEBs may also be accounted as

			 * "empty taken" if they are empty.

			 */

			ubifs_assert(c->lst.taken_empty_lebs > 0);

		}

	} else

		ubifs_assert(c->lst.taken_empty_lebs == 1);

		ubifs_assert(c->lst.taken_empty_lebs > 0);



	err = dbg_check_filesystem(c);

	if (err)
@@ -1775,7 +1779,7 @@ static int ubifs_remount_fs(struct super_block *sb, int *flags, char *data) 
		c->bu.buf = NULL;

	}



	ubifs_assert(c->lst.taken_empty_lebs == 1);

	ubifs_assert(c->lst.taken_empty_lebs > 0);

	return 0;

}