Attachment 304635 Details for Bug 444960 – backported patch

[patch] backported patch

jffs2-fix-space-leak.patch (text/plain), 1.37 KB, created by Josef Bacik on 2008-05-06 14:28:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Bacik

Created: 2008-05-06 14:28:46 UTC

Size: 1.37 KB

patch

obsolete

>diff -up linux-2.6.18.x86_64/fs/jffs2/erase.c.josef linux-2.6.18.x86_64/fs/jffs2/erase.c
>--- linux-2.6.18.x86_64/fs/jffs2/erase.c.josef	2008-05-06 10:10:21.000000000 -0400
>+++ linux-2.6.18.x86_64/fs/jffs2/erase.c	2008-05-06 10:14:08.000000000 -0400
>@@ -382,9 +382,6 @@ static void jffs2_mark_erased_block(stru
> 			if (jffs2_write_nand_cleanmarker(c, jeb))
> 				goto filebad;
> 		}
>-
>-		/* Everything else got zeroed before the erase */
>-		jeb->free_size = c->sector_size;
> 	} else {
> 
> 		struct kvec vecs[1];
>@@ -412,17 +409,19 @@ static void jffs2_mark_erased_block(stru
> 
> 			goto filebad;
> 		}
>-
>-		/* Everything else got zeroed before the erase */
>-		jeb->free_size = c->sector_size;
>-		/* FIXME Special case for cleanmarker in empty block */
>-		jffs2_link_node_ref(c, jeb, jeb->offset | REF_NORMAL, c->cleanmarker_size, NULL);
> 	}
>+	/* Everything else got zeroed before the erase */
>+	jeb->free_size = c->sector_size;
> 
> 	spin_lock(&c->erase_completion_lock);
>+
>+
> 	c->erasing_size -= c->sector_size;
>-	c->free_size += jeb->free_size;
>-	c->used_size += jeb->used_size;
>+	c->free_size += c->sector_size;
>+
>+	/* Account for cleanmarker now, if it's in-band */
>+	if (c->cleanmarker_size && !jffs2_cleanmarker_oob(c))
>+		jffs2_link_node_ref(c, jeb, jeb->offset | REF_NORMAL, c->cleanmarker_size, NULL);
> 
> 	jffs2_dbg_acct_sanity_check_nolock(c,jeb);
> 	jffs2_dbg_acct_paranoia_check_nolock(c, jeb);

Actions: View | Diff

Attachments on bug 444960: 304635