Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250447
b: refs/heads/master
c: c839e29
h: refs/heads/master
i:
  250445: e145a70
  250443: f394a38
  250439: f885bee
  250431: f60152c
v: v3
  • Loading branch information
Artem Bityutskiy authored and Artem Bityutskiy committed May 16, 2011
1 parent 67a4b29 commit 20a77de
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 12346037a71809197b22e223c3a719190a26172d
refs/heads/master: c839e29768059c56ef233586e66a2a66edbe93a3
7 changes: 3 additions & 4 deletions trunk/fs/ubifs/recovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion trunk/fs/ubifs/replay.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 20a77de

Please sign in to comment.