From bcdca3e10ac22c208955a63c907a0988550bc666 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Tue, 26 Apr 2011 10:07:50 +0300 Subject: 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: Artem Bityutskiy --- fs/ubifs/recovery.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index 1a72046efed5..3e0eedbe49ce 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -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. -- cgit v1.2.3