diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-06-29 14:39:57 +0200 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-02 22:39:50 +0200 |
commit | 71c23397752c0e40722d931ab9152342e9673336 (patch) | |
tree | b6bc0e6b37b815c9f054b5184c8d1b8ec72208ce /fs/jffs2/write.c | |
parent | [JFFS2] Prevent oops after 'node added in wrong place' debug check (diff) | |
download | linux-71c23397752c0e40722d931ab9152342e9673336.tar.xz linux-71c23397752c0e40722d931ab9152342e9673336.zip |
[JFFS2] Deletion dirents should be REF_NORMAL, not REF_PRISTINE.
Otherwise they'll never actually get garbage-collected.
Noted by Jonathan Larmour.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2/write.c')
-rw-r--r-- | fs/jffs2/write.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c index 1406f2ce20a7..bc6185933664 100644 --- a/fs/jffs2/write.c +++ b/fs/jffs2/write.c @@ -296,7 +296,8 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff return ERR_PTR(ret?ret:-EIO); } /* Mark the space used */ - fd->raw = jffs2_add_physical_node_ref(c, flash_ofs | REF_PRISTINE, PAD(sizeof(*rd)+namelen), f->inocache); + fd->raw = jffs2_add_physical_node_ref(c, flash_ofs | dirent_node_state(rd), + PAD(sizeof(*rd)+namelen), f->inocache); if (IS_ERR(fd->raw)) { void *hold_err = fd->raw; /* Release the full_dirent which is now useless, and return */ |