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

[JFFS2] Add length argument to jffs2_add_physical_node_ref()

Browse Source 
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>
This commit is contained in:
David Woodhouse
2006-05-21 04:36:45 +01:00
parent 49f11d4075
commit b64335f2b7
6 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/jffs2/gc.c
View File

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