---

yaml --- r: 250433 b: refs/heads/master c: bcdca3e h: refs/heads/master i: 250431: f60152c v: v3
git-mirror · May 13, 2011 · b5f6220 · b5f6220
1 parent d7791cd
commit b5f6220
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git 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
@@ -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.