mtd/fs/jffs2 wbuf.c,1.51,1.52

[David Woodhouse]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv24671

Modified Files:
	wbuf.c 
Log Message:
Waste space at end of block moving to bad_used_list; don't dirty it. It's not 
considered reclaimable.


Index: wbuf.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/wbuf.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- wbuf.c	7 Oct 2003 13:15:27 -0000	1.51
+++ wbuf.c	8 Oct 2003 17:20:08 -0000	1.52
@@ -166,15 +166,13 @@
 	D2(jffs2_dump_block_lists(c));
 
 	/* Adjust its size counts accordingly */
-	c->dirty_size += jeb->free_size;
-	c->free_size -= jeb->free_size; 
-	jeb->dirty_size += jeb->free_size;
+	c->wasted_size += jeb->free_size;
+	c->free_size -= jeb->free_size;
+	jeb->wasted_size += jeb->free_size;
 	jeb->free_size = 0;
 
-	c->dirty_size += jeb->wasted_size;
-	c->wasted_size -= jeb->wasted_size; 
-	jeb->dirty_size += jeb->wasted_size;
-       	jeb->wasted_size = 0;
+	ACCT_SANITY_CHECK(c,jeb);
+	D1(ACCT_PARANOIA_CHECK(jeb));
 
 	/* Find the first node to be recovered, by skipping over every
 	   node which ends before the wbuf starts, or which is obsolete. */