Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27779
b: refs/heads/master
c: 5b5ffbc
h: refs/heads/master
i:
  27777: 1cd6f07
  27775: c068fc7
v: v3
  • Loading branch information
Florin Malita authored and David Woodhouse committed May 15, 2006
1 parent e3e3134 commit b94594f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 184f565210c6c8a852c53ffc070f9add61e0f331
refs/heads/master: 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce
6 changes: 3 additions & 3 deletions trunk/fs/jffs2/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,6 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
}
}

if (jffs2_sum_active() && s)
kfree(s);

/* Nextblock dirty is always seen as wasted, because we cannot recycle it now */
if (c->nextblock && (c->nextblock->dirty_size)) {
c->nextblock->wasted_size += c->nextblock->dirty_size;
Expand Down Expand Up @@ -266,6 +263,9 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
else
c->mtd->unpoint(c->mtd, flashbuf, 0, c->mtd->size);
#endif
if (s)
kfree(s);

return ret;
}

Expand Down

0 comments on commit b94594f

Please sign in to comment.