From b5f6220d9f9c5342327b4b2e16962e920126ae20 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Tue, 26 Apr 2011 10:07:50 +0300
Subject: [PATCH] --- yaml --- r: 250433 b: refs/heads/master c:
 bcdca3e10ac22c208955a63c907a0988550bc666 h: refs/heads/master i:   250431:
 f60152cacdba6daffa1507059e3baa925d065b91 v: v3

---
 [refs]                    |  2 +-
 trunk/fs/ubifs/recovery.c | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 4e30ebc903c3..d5e8d3b54097 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2405f5948119cdc1c28697fd3110124dad974898
+refs/heads/master: bcdca3e10ac22c208955a63c907a0988550bc666
diff --git a/trunk/fs/ubifs/recovery.c b/trunk/fs/ubifs/recovery.c
index 1a72046efed5..3e0eedbe49ce 100644
--- a/trunk/fs/ubifs/recovery.c
+++ b/trunk/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.