mtd/fs/jffs2 summary.c,1.3,1.4 summary.h,1.1,1.2

[havasi at infradead.org]

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

Modified Files:
	summary.c summary.h 
Log Message:
[JFFS2] rename jffs2_summary_node to jffs2_raw_summary



Index: summary.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/summary.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- summary.c	21 Sep 2005 14:43:07 -0000	1.3
+++ summary.c	26 Sep 2005 11:37:21 -0000	1.4
@@ -292,7 +292,7 @@
 /* Process the stored summary information - helper function for jffs2_sum_scan_sumnode() */
 
 static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,
-				struct jffs2_summary_node *summary, uint32_t *pseudo_random)
+				struct jffs2_raw_summary *summary, uint32_t *pseudo_random)
 {
 	struct jffs2_raw_node_ref *raw;
 	struct jffs2_inode_cache *ic;
@@ -428,7 +428,7 @@
 {
 	struct jffs2_unknown_node crcnode;
 	struct jffs2_raw_node_ref *cache_ref;
-	struct jffs2_summary_node *summary;
+	struct jffs2_raw_summary *summary;
 	int ret, sumsize;
 	uint32_t crc;
 
@@ -468,14 +468,14 @@
 		goto crc_err;
 	}
 
-	crc = crc32(0, summary, sizeof(struct jffs2_summary_node)-8);
+	crc = crc32(0, summary, sizeof(struct jffs2_raw_summary)-8);
 
 	if (je32_to_cpu(summary->node_crc) != crc) {
 		dbg_summary("Summary node is corrupt (bad CRC)\n");
 		goto crc_err;
 	}
 
-	crc = crc32(0, summary->sum, sumsize - sizeof(struct jffs2_summary_node));
+	crc = crc32(0, summary->sum, sumsize - sizeof(struct jffs2_raw_summary));
 
 	if (je32_to_cpu(summary->sum_crc) != crc) {
 		dbg_summary("Summary node data is corrupt (bad CRC)\n");
@@ -560,7 +560,7 @@
 static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,
 					uint32_t infosize, uint32_t datasize, int padsize)
 {
-	struct jffs2_summary_node isum;
+	struct jffs2_raw_summary isum;
 	union jffs2_sum_mem *temp;
 	struct jffs2_sum_marker *sm;
 	struct kvec vecs[2];
@@ -685,7 +685,7 @@
 	}
 
 	datasize = c->summary->sum_size + sizeof(struct jffs2_sum_marker);
-	infosize = sizeof(struct jffs2_summary_node) + datasize;
+	infosize = sizeof(struct jffs2_raw_summary) + datasize;
 	padsize = jeb->free_size - infosize;
 	infosize += padsize; 
 	datasize += padsize;

Index: summary.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/summary.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- summary.h	7 Sep 2005 08:34:54 -0000	1.1
+++ summary.h	26 Sep 2005 11:37:21 -0000	1.2
@@ -142,7 +142,7 @@
 	jint32_t magic; 	/* == JFFS2_SUM_MAGIC */
 };
 
-#define JFFS2_SUMMARY_FRAME_SIZE (sizeof(struct jffs2_summary_node) + sizeof(struct jffs2_sum_marker))
+#define JFFS2_SUMMARY_FRAME_SIZE (sizeof(struct jffs2_raw_summary) + sizeof(struct jffs2_sum_marker))
 
 #ifdef CONFIG_JFFS2_SUMMARY	/* SUMMARY SUPPORT ENABLED */