diff options
| author | KaiGai Kohei <kaigai@ak.jp.nec.com> | 2006-05-18 17:43:53 +0200 |
|---|---|---|
| committer | KaiGai Kohei <kaigai@ak.jp.nec.com> | 2006-05-18 17:43:53 +0200 |
| commit | 20a92fc74c5c91c7bc5693d51acc2b99aceb0465 (patch) | |
| tree | 41bf535f38ff1a29c560bcf622e9b4ef03c2c106 /fs/jffs2/scan.c | |
| parent | [JFFS2][XATTR] Fix obvious typo (diff) | |
| parent | [MTD] Fix printk format error in gen_probe.c (diff) | |
| download | linux-20a92fc74c5c91c7bc5693d51acc2b99aceb0465.tar.xz linux-20a92fc74c5c91c7bc5693d51acc2b99aceb0465.zip | |
Merge git://git.infradead.org/mtd-2.6
Diffstat (limited to 'fs/jffs2/scan.c')
| -rw-r--r-- | fs/jffs2/scan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index 0a79fc921e9f..5847e76ce16c 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c @@ -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; } |