mtd/fs/jffs3 nodemgmt.c,3.8,3.9

[Artem Bityuckiy]

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

Modified Files:
	nodemgmt.c 
Log Message:
__totlen removing fixes.`


Index: nodemgmt.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/nodemgmt.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -r3.8 -r3.9
--- nodemgmt.c	27 Dec 2004 10:14:08 -0000	3.8
+++ nodemgmt.c	3 Jan 2005 18:43:38 -0000	3.9
@@ -253,13 +253,15 @@
 				return - ENOMEM;
 			ref->flash_offset = PAD(jeb->offset + (c->sector_size - jeb->free_size)) | REF_OBSOLETE;
 #ifdef TMP_TOTLEN
-			ref->__totlen = c->wbuf_pagesize - c->wbuf_len;
+			ref->__totlen = jeb->free_size;
 #endif
 			ref->next_in_ino = NULL;
 			ref->next_phys = NULL;
 			DBG_BL(1, "Too few space at the block %#x (%#x bytes), waste it\n",
-					jeb->offset, c->sector_size - jeb->free_size);
-			jffs3_add_physical_node_ref(c, ref, c->sector_size - jeb->free_size);
+					jeb->offset, jeb->free_size);
+			spin_unlock(&c->erase_completion_lock);
+			jffs3_add_physical_node_ref(c, ref, jeb->free_size);
+			spin_lock(&c->erase_completion_lock);
 			if (SANITY)
 				BUG_ON(jeb->free_size != 0);
 
@@ -437,7 +439,8 @@
 		list_add_tail(&jeb->list, &c->clean_list);
 		c->nextblock = NULL;
 	}
-	jffs3_dbg_acct_sanity_check(c, jeb);
+	if (SANITY)
+		jffs3_dbg_acct_sanity_check(c, jeb);
 	if (PARANOIA)
 		jffs3_dbg_acct_paranoia_check(c, jeb);
 
@@ -496,7 +499,6 @@
 	}
 	jeb = &c->blocks[blocknr];
 
-/* TODO: remove */ jffs3_dbg_dump_node_refs(c, jeb);
 	if (jffs3_can_mark_obsolete(c) && !jffs3_is_readonly(c) &&
 	    !(c->flags & JFFS3_SB_FLAG_MOUNTING)) {
 		/* Hm. This may confuse static lock analysis. If any of the above