mtd/fs/jffs3 summary.c,3.8,3.9 scan.c,3.11,3.12 erase.c,3.8,3.9

[hammache at infradead.org]

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

Modified Files:
	summary.c scan.c erase.c 
Log Message:
Correct JFFS2 / JFFS3 typos.



Index: summary.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/summary.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -r3.8 -r3.9
--- summary.c	31 Jan 2005 14:45:25 -0000	3.8
+++ summary.c	5 Feb 2005 18:21:55 -0000	3.9
@@ -586,7 +586,7 @@
 int jffs3_sum_write_sumnode(struct jffs3_sb_info *c)
 {
 	struct jffs3_summary_node isum;
-	struct jffs2_raw_node_ref *summary_ref;
+	struct jffs3_raw_node_ref *summary_ref;
 	union jffs3_sum_mem *temp;
 	jint32_t offset;
 	jint32_t *wpage;
@@ -745,7 +745,7 @@
 		return 0;
 	}
 	
-	summary_ref = jffs2_alloc_raw_node_ref();
+	summary_ref = jffs3_alloc_raw_node_ref();
 	
 	if (!summary_ref) {
 		printk(KERN_NOTICE "Failed to allocate node ref for summary\n");

Index: scan.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/scan.c,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -r3.11 -r3.12
--- scan.c	28 Jan 2005 10:31:01 -0000	3.11
+++ scan.c	5 Feb 2005 18:21:55 -0000	3.12
@@ -672,7 +672,7 @@
 			DBG_SUMMARY(1,"There is not enough space for " 
 				"summary information, freeing up summary info!\n");
 			jffs3_sum_clean_collected(jeb);
-			jeb->sum_collected->sum_size = JFFS2_SUMMARY_NOSUM_SIZE;
+			jeb->sum_collected->sum_size = JFFS3_SUMMARY_NOSUM_SIZE;
 		}
 		
 	}

Index: erase.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/erase.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -r3.8 -r3.9
--- erase.c	31 Jan 2005 14:45:25 -0000	3.8
+++ erase.c	5 Feb 2005 18:21:55 -0000	3.9
@@ -20,6 +20,7 @@
 #include <linux/sched.h>
 #include <linux/pagemap.h>
 #include "nodelist.h"
+#include "summary.h"
 
 struct erase_priv_struct {
 	struct jffs3_eraseblock *jeb;
@@ -423,7 +424,7 @@
 	
 	if (jeb->sum_collected) {
 	
-		jffs2_sum_clean_collected(jeb);
+		jffs3_sum_clean_collected(jeb);
 		jeb->sum_collected->sum_size = 0;
 		jeb->sum_collected->sum_padded = 0;
 	}