mtd/fs/jffs3 nodelist.h,3.9,3.10 scan.h,1.3,1.4 super.c,3.6,3.7

[Artem Bityuckiy]

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

Modified Files:
	nodelist.h scan.h super.c 
Log Message:
Debug/formatting changes.


Index: nodelist.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/nodelist.h,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -r3.9 -r3.10
--- nodelist.h	27 Dec 2004 10:14:08 -0000	3.9
+++ nodelist.h	3 Jan 2005 18:45:01 -0000	3.10
@@ -222,7 +222,7 @@
 		if (ref != jeb->last_node) {
 			ERROR_MSG("ref %p, offset %#x, __totlen %u\n", ref, ref_offs, ref->__totlen);
 			ERROR_MSG("ref->next_phys is NULL, but this is not the last node for this block\n");
-			if (PARANOIA)
+			if (DEBUG1)
 				jffs3_dbg_dump_node_refs(c, jeb);
 			return ref->__totlen;
 		}
@@ -248,7 +248,7 @@
 			"%#x (%#08x-%#08x) instead of %#x\n",
 			ref, ref->__totlen, ref_offs, ref_offs + ref->__totlen,
 			ref_end - ref_offs, ref_offs, ref_end, ref->__totlen);
-		if (PARANOIA)
+		if (DEBUG1)
 			jffs3_dbg_dump_node_refs(c, jeb);
 	}
 	return ref->__totlen;

Index: scan.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/scan.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scan.h	27 Dec 2004 10:43:13 -0000	1.3
+++ scan.h	3 Jan 2005 18:45:01 -0000	1.4
@@ -26,10 +26,6 @@
 		c->free_size -= _x; c->used_size += _x; \
 		jeb->free_size -= _x ; jeb->used_size += _x; \
 		}while(0)
-#define WASTED_SPACE(x) do { typeof(x) _x = (x); \
-		c->free_size -= _x; c->wasted_size += _x; \
-		jeb->free_size -= _x ; jeb->wasted_size += _x; \
-		}while(0)
 #define UNCHECKED_SPACE(x) do { typeof(x) _x = (x); \
 		c->free_size -= _x; c->unchecked_size += _x; \
 		jeb->free_size -= _x ; jeb->unchecked_size += _x; \
@@ -75,7 +71,7 @@
 		DBG_SCAN(2, "Add dirt of length %#x to the node_refs list\n", size);
 
 		/* 
-		 * If the previous node represents dirt too, dont
+		 * If the previous node represents dirt too, don't
 		 * allocate new node_ref object.
 		 */
 		if (jeb->last_node && ref_obsolete(jeb->last_node)) {

Index: super.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/super.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -r3.6 -r3.7
--- super.c	25 Dec 2004 11:11:22 -0000	3.6
+++ super.c	3 Jan 2005 18:45:02 -0000	3.7
@@ -31,11 +31,11 @@
 static void jffs3_put_super(struct super_block *);
 
 static kmem_cache_t *jffs3_inode_cachep;
-
-static struct inode *jffs3_alloc_inode(struct super_block *sb)
+struct inode *jffs3_alloc_inode(struct super_block *sb)
 {
 	struct jffs3_inode_info *ei;
 	ei = (struct jffs3_inode_info *)kmem_cache_alloc(jffs3_inode_cachep, SLAB_KERNEL);
+	DBG_SALLOC(1, "Allocated jffs3_inode_info at %p\n", ei);
 	if (!ei)
 		return NULL;
 	return &ei->vfs_inode;
@@ -43,6 +43,7 @@
 
 static void jffs3_destroy_inode(struct inode *inode)
 {
+	DBG_SALLOC(1, "Free jffs3_inode_info at %p\n", JFFS3_INODE_INFO(inode));
 	kmem_cache_free(jffs3_inode_cachep, JFFS3_INODE_INFO(inode));
 }
 
@@ -278,8 +279,8 @@
 	jffs3_flush_wbuf_pad(c);
 	up(&c->alloc_sem);
 #ifdef CONFIG_JFFS3_SUMMARY
-    jffs3_sum_clean_all_info(c);
-    jffs3_sum_exit(c);
+	jffs3_sum_clean_all_info(c);
+	jffs3_sum_exit(c);
 #endif
 	jffs3_free_ino_caches(c);
 	jffs3_free_raw_node_refs(c);
@@ -363,6 +364,7 @@
 	jffs3_destroy_slab_caches();
 	jffs3_compressors_exit();
 	kmem_cache_destroy(jffs3_inode_cachep);
+jffs3_inode_cachep = NULL;
 }
 
 module_init(init_jffs3_fs);