UBIFS: intialize LPT earlier (781c5717) · Commits · 戴 / test

The current 'mount_ubifs()' implementation does not initialize the LPT until the the master node is marked dirty. Move the LPT initialization to before marking the master node dirty. This is a preparation for the next patch which will move the free-space-fixup check to before marking the master node dirty, because we have to fix-up the free space before doing any writes. Artem: massaged the patch and commit message. Signed-off-by:

Ben Gardiner <bengardiner@nanometrics.ca> Reviewed-by:

Matthew L. Creech <mlcreech@gmail.com> Signed-off-by:

Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

fs/ubifs/super.c

+16 −13

Original line number	Diff line number	Diff line
		@@ -1282,30 +1282,33 @@ static int mount_ubifs(struct ubifs_info *c)
		if (err)
		goto out_master;

		init_constants_master(c);

		if ((c->mst_node->flags & cpu_to_le32(UBIFS_MST_DIRTY)) != 0) {
		ubifs_msg("recovery needed");
		c->need_recovery = 1;
		if (!c->ro_mount) {
		}

		init_constants_master(c);

		if (c->need_recovery && !c->ro_mount) {
		err = ubifs_recover_inl_heads(c, c->sbuf);
		if (err)
		goto out_master;
		}
		} else if (!c->ro_mount) {

		err = ubifs_lpt_init(c, 1, !c->ro_mount);
		if (err)
		goto out_master;

		if (!c->ro_mount) {
		/*
		* Set the "dirty" flag so that if we reboot uncleanly we
		* will notice this immediately on the next mount.
		*/
		c->mst_node->flags \|= cpu_to_le32(UBIFS_MST_DIRTY);
		err = ubifs_write_master(c);
		if (err)
		goto out_master;
		}

		err = ubifs_lpt_init(c, 1, !c->ro_mount);
		if (err)
		goto out_lpt;
		}

		err = dbg_check_idx_size(c, c->bi.old_idx_sz);
		if (err)

Admin message