From 20a77de306387585209e27bccd1c34d50ce4042f Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Fri, 13 May 2011 12:26:54 +0300
Subject: [PATCH] --- yaml --- r: 250447 b: refs/heads/master c:
 c839e29768059c56ef233586e66a2a66edbe93a3 h: refs/heads/master i:   250445:
 e145a70a822fd65fd22a0b53b9249eaf14fd575c   250443:
 f394a38d3e2beca988d1aec9fcf870d1a7466470   250439:
 f885bee393778398eb0815c281dbfee6db630b4b   250431:
 f60152cacdba6daffa1507059e3baa925d065b91 v: v3

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

diff --git a/[refs] b/[refs]
index 1698080a073b..04d1e3cebd0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12346037a71809197b22e223c3a719190a26172d
+refs/heads/master: c839e29768059c56ef233586e66a2a66edbe93a3
diff --git a/trunk/fs/ubifs/recovery.c b/trunk/fs/ubifs/recovery.c
index 3f41a0ce192b..42b4512c46b0 100644
--- a/trunk/fs/ubifs/recovery.c
+++ b/trunk/fs/ubifs/recovery.c
@@ -1140,12 +1140,11 @@ int ubifs_rcvry_gc_commit(struct ubifs_info *c)
 	struct ubifs_lprops lp;
 	int err;
 
+	dbg_rcvry("GC head LEB %d, offs %d", wbuf->lnum, wbuf->offs);
+
 	c->gc_lnum = -1;
-	if (wbuf->lnum == -1 || wbuf->offs == c->leb_size) {
-		dbg_rcvry("no GC head: wbuf->lnum %d, wbuf->offs %d",
-			  wbuf->lnum, wbuf->offs);
+	if (wbuf->lnum == -1 || wbuf->offs == c->leb_size)
 		return grab_empty_leb(c);
-	}
 
 	err = ubifs_find_dirty_leb(c, &lp, wbuf->offs, 2);
 	if (err) {
diff --git a/trunk/fs/ubifs/replay.c b/trunk/fs/ubifs/replay.c
index c29c4687cc52..005266330192 100644
--- a/trunk/fs/ubifs/replay.c
+++ b/trunk/fs/ubifs/replay.c
@@ -509,7 +509,7 @@ static int replay_bud(struct ubifs_info *c, int lnum, int offs, int jhead,
 	struct ubifs_scan_node *snod;
 	struct ubifs_bud *bud;
 
-	dbg_mnt("replay bud LEB %d, head %d", lnum, jhead);
+	dbg_mnt("replay bud LEB %d, head %d, offs %d", lnum, jhead, offs);
 	if (c->need_recovery)
 		sleb = ubifs_recover_leb(c, lnum, offs, c->sbuf, jhead != GCHD);
 	else
@@ -636,6 +636,7 @@ static int replay_bud(struct ubifs_info *c, int lnum, int offs, int jhead,
 
 	*dirty = sleb->endpt - offs - used;
 	*free = c->leb_size - sleb->endpt;
+	dbg_mnt("bud LEB %d replied: dirty %d, free %d", lnum, *dirty, *free);
 
 out:
 	ubifs_scan_destroy(sleb);