diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-21 04:36:45 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-21 04:36:45 +0100 |
| commit | b64335f2b740d6f5dbf5d3b04af30d407bf599f5 (patch) | |
| tree | 442e85ebc977f8d01bf9c1fe6dfbe898788422c5 /fs/jffs2/gc.c | |
| parent | 49f11d40751b974f3b829f208eefa6f97a10cac8 (diff) | |
| download | kernel_samsung_smdk4412-b64335f2b740d6f5dbf5d3b04af30d407bf599f5.tar.gz kernel_samsung_smdk4412-b64335f2b740d6f5dbf5d3b04af30d407bf599f5.tar.bz2 kernel_samsung_smdk4412-b64335f2b740d6f5dbf5d3b04af30d407bf599f5.zip | |
[JFFS2] Add length argument to jffs2_add_physical_node_ref()
If __totlen is going away, we need to pass the length in separately.
Also stop callers from needlessly setting ref->next_phys to NULL,
since that's done for them... and since that'll also be going away soon.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2/gc.c')
| -rw-r--r-- | fs/jffs2/gc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c index b0a5c407b47..4773ba24304 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, /* OK, all the CRCs are good; this node can just be copied as-is. */ retry: nraw->flash_offset = phys_ofs; - nraw->__totlen = rawlen; - nraw->next_phys = NULL; ret = jffs2_flash_write(c, phys_ofs, rawlen, &retlen, (char *)node); @@ -640,7 +638,7 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c, nraw->next_in_ino = NULL; nraw->flash_offset |= REF_OBSOLETE; - jffs2_add_physical_node_ref(c, nraw); + jffs2_add_physical_node_ref(c, nraw, rawlen); jffs2_mark_node_obsolete(c, nraw); } else { 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, goto out_node; } nraw->flash_offset |= REF_PRISTINE; - jffs2_add_physical_node_ref(c, nraw); + jffs2_add_physical_node_ref(c, nraw, rawlen); if (ic) { /* Link into per-inode list. This is safe because of the ic |