aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/gc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/jffs2/gc.c')
-rw-r--r--fs/jffs2/gc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c
index b0a5c407b476..4773ba24304f 100644
--- a/fs/jffs2/gc.c
+++ b/fs/jffs2/gc.c
@@ -627,8 +627,6 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,
627 /* OK, all the CRCs are good; this node can just be copied as-is. */ 627 /* OK, all the CRCs are good; this node can just be copied as-is. */
628 retry: 628 retry:
629 nraw->flash_offset = phys_ofs; 629 nraw->flash_offset = phys_ofs;
630 nraw->__totlen = rawlen;
631 nraw->next_phys = NULL;
632 630
633 ret = jffs2_flash_write(c, phys_ofs, rawlen, &retlen, (char *)node); 631 ret = jffs2_flash_write(c, phys_ofs, rawlen, &retlen, (char *)node);
634 632
@@ -640,7 +638,7 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,
640 nraw->next_in_ino = NULL; 638 nraw->next_in_ino = NULL;
641 639
642 nraw->flash_offset |= REF_OBSOLETE; 640 nraw->flash_offset |= REF_OBSOLETE;
643 jffs2_add_physical_node_ref(c, nraw); 641 jffs2_add_physical_node_ref(c, nraw, rawlen);
644 jffs2_mark_node_obsolete(c, nraw); 642 jffs2_mark_node_obsolete(c, nraw);
645 } else { 643 } else {
646 printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", nraw->flash_offset); 644 printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", nraw->flash_offset);
@@ -680,7 +678,7 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,
680 goto out_node; 678 goto out_node;
681 } 679 }
682 nraw->flash_offset |= REF_PRISTINE; 680 nraw->flash_offset |= REF_PRISTINE;
683 jffs2_add_physical_node_ref(c, nraw); 681 jffs2_add_physical_node_ref(c, nraw, rawlen);
684 682
685 if (ic) { 683 if (ic) {
686 /* Link into per-inode list. This is safe because of the ic 684 /* Link into per-inode list. This is safe because of the ic