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

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

UBIFS: remove dead GC LEB recovery piece of code 



This patch removes a piece of code in 'ubifs_rcvry_gc_commit()' which is never
executed. We call 'ubifs_find_dirty_leb()' function with min_space =
wbuf->offs, so if it returns us an LEB, it is guaranteed to have at lease
'wbuf->offs' bytes of free+dirty space. So we can remove the subsequent code
which deals with "returned LEB has less than 'wbuf->offs' bytes of free+dirty
space". This simplifies 'ubifs_rcvry_gc_commit()' a little.

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

fs/ubifs/recovery.c

+1 −12
Original line number Diff line number Diff line
@@ -1127,20 +1127,9 @@ int ubifs_rcvry_gc_commit(struct ubifs_info *c) 
	}



	ubifs_assert(!(lp.flags & LPROPS_INDEX));

	ubifs_assert(lp.free + lp.dirty >= wbuf->offs);

	lnum = lp.lnum;



	/*

	 * There was no empty LEB so the used space in the dirtiest LEB must fit

	 * in the GC head LEB.

	 */

	if (lp.free + lp.dirty < wbuf->offs) {

		dbg_rcvry("LEB %d doesn't fit in GC head LEB %d:%d",

			  lnum, wbuf->lnum, wbuf->offs);

		err = ubifs_return_leb(c, lnum);

		if (err)

			return err;

		goto find_free;

	}

	/*

	 * We run the commit before garbage collection otherwise subsequent

	 * mounts will see the GC and orphan deletion in a different order.