lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.infradead.org/mtd-2.6

Browse Source
This commit is contained in:
KaiGai Kohei
2006-05-19 00:43:53 +09:00
parent 21b9879bf2 f6a673b3f4
commit 20a92fc74c
360 changed files with 6638 additions and 4480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/jffs2/scan.c
View File

@ -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;
@ -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;
}