mtd/fs/jffs2 wbuf.c,1.56,1.57 malloc.c,1.26,1.27 nodelist.c,1.83,1.84 nodelist.h,1.107,1.108

[David Woodhouse]

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

Modified Files:
	wbuf.c malloc.c nodelist.c nodelist.h 
Log Message:
Revert bogus commit

Index: wbuf.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/wbuf.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- wbuf.c	28 Oct 2003 17:13:09 -0000	1.56
+++ wbuf.c	28 Oct 2003 17:14:58 -0000	1.57
@@ -966,7 +966,7 @@
 					retval = 1;
 				}
 			}
-			D2(if (retval == 1) {
+			D1(if (retval == 1) {
 				printk(KERN_WARNING "jffs2_check_nand_cleanmarker(): Cleanmarker node not detected in block at %08x\n", jeb->offset);
 				printk(KERN_WARNING "OOB at %08x was ", offset);
 				for (i=0; i < oob_size; i++) {

Index: malloc.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/malloc.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- malloc.c	28 Oct 2003 17:13:09 -0000	1.26
+++ malloc.c	28 Oct 2003 17:14:58 -0000	1.27
@@ -17,7 +17,7 @@
 #include <linux/jffs2.h>
 #include "nodelist.h"
 
-#if 1
+#if 0
 #define JFFS2_SLAB_POISON SLAB_POISON
 #else
 #define JFFS2_SLAB_POISON 0

Index: nodelist.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodelist.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- nodelist.c	28 Oct 2003 17:13:09 -0000	1.83
+++ nodelist.c	28 Oct 2003 17:14:58 -0000	1.84
@@ -25,11 +25,7 @@
 {
 	struct jffs2_full_dirent **prev = list;
 	D1(printk(KERN_DEBUG "jffs2_add_fd_to_list( %p, %p (->%p))\n", new, list, *list));
-	if (!new->raw) {
-		printk(KERN_NOTICE "Add fd to list with NULL raw. \"%s\"->#%u\n",
-		       new->name, new->ino);
-		__backtrace();
-	}
+
 	while ((*prev) && (*prev)->nhash <= new->nhash) {
 		if ((*prev)->nhash == new->nhash && !strcmp((*prev)->name, new->name)) {
 			/* Duplicate. Free one */
@@ -53,44 +49,20 @@
 	*prev = new;
 
  out:
-#if 0
-	{ uint32_t lasthash = 0;
-
-		for (prev = list; *prev; prev = &((*prev)->next)) {
-			if ((*prev)->nhash <= lasthash) {
-				printk(KERN_CRIT "dirent hash list corrupt\n");
-				
-				while(*list && list != prev) {
-					printk(KERN_CRIT "@%p Dirent \"%s\" (hash 0x%08x, ino #%u) next %p\n", (*list), (*list)->name, (*list)->nhash, (*list)->ino, (*list)->next);
-					list = &(*list)->next;
-				}
-				printk(KERN_CRIT "..@%p Dirent \"%s\" (hash 0x%08x, ino #%u) next %p\n", (*list), (*prev)->name, (*prev)->nhash, (*prev)->ino, (*list)->next);
-			}
-		}
-	}
-#endif
+	D2(while(*list) {
+		printk(KERN_DEBUG "Dirent \"%s\" (hash 0x%08x, ino #%u\n", (*list)->name, (*list)->nhash, (*list)->ino);
+		list = &(*list)->next;
+	});
 }
 
 /* Put a new tmp_dnode_info into the list, keeping the list in 
    order of increasing version
 */
-static void jffs2_add_tn_to_list(struct jffs2_tmp_dnode_info *tn, struct jffs2_tmp_dnode_info **list)
+void jffs2_add_tn_to_list(struct jffs2_tmp_dnode_info *tn, struct jffs2_tmp_dnode_info **list)
 {
 	struct jffs2_tmp_dnode_info **prev = list;
-	uint32_t oldver = 0;
-
+	
 	while ((*prev) && (*prev)->version < tn->version) {
-		if ((*prev)->version < oldver) {
-			struct jffs2_tmp_dnode_info *this = *list;
-			printk(KERN_CRIT "Eeep. TN list goes backwards!\n");
-			while (this && this != (*prev)->next) {
-				printk(KERN_CRIT "tn at %p is version %d, node at %p (0x%08x)\n",
-				       this, this->version, this->fn, ref_offset(this->fn->raw));
-				this = this->next;
-			}
-			BUG();
-		}
-		oldver = (*prev)->version;
 		prev = &((*prev)->next);
 	}
 	tn->next = (*prev);

Index: nodelist.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodelist.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- nodelist.h	28 Oct 2003 17:13:09 -0000	1.107
+++ nodelist.h	28 Oct 2003 17:14:58 -0000	1.108
@@ -360,6 +360,7 @@
 /* nodelist.c */
 D1(void jffs2_print_frag_list(struct jffs2_inode_info *f));
 void jffs2_add_fd_to_list(struct jffs2_sb_info *c, struct jffs2_full_dirent *new, struct jffs2_full_dirent **list);
+void jffs2_add_tn_to_list(struct jffs2_tmp_dnode_info *tn, struct jffs2_tmp_dnode_info **list);
 int jffs2_get_inode_nodes(struct jffs2_sb_info *c, ino_t ino, struct jffs2_inode_info *f,
 			  struct jffs2_tmp_dnode_info **tnp, struct jffs2_full_dirent **fdp,
 			  uint32_t *highest_version, uint32_t *latest_mctime,