Put both the summary and checkpoint version stamps together, update checkpoint version

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/yaffs_guts.h b/yaffs_guts.h
index b3bc574a51b29fe2b99159898e9ea27157a765bd..a9fdde2213c46b315b56ab333754852867b4cab7 100644 (file)
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -75,7 +75,9 @@
 #define YAFFS_OBJECT_SPACE             0x40000
 #define YAFFS_MAX_OBJECT_ID            (YAFFS_OBJECT_SPACE - 1)
 
-#define YAFFS_CHECKPOINT_VERSION       5
+/* Binary data version stamps */
+#define YAFFS_SUMMARY_VERSION          1
+#define YAFFS_CHECKPOINT_VERSION       6
 
 #ifdef CONFIG_YAFFS_UNICODE
 #define YAFFS_MAX_NAME_LENGTH          127

diff --git a/yaffs_summary.c b/yaffs_summary.c
index 20b27d843c739f4e222b7ddfe5132d9ea408f6e8..def00525a0ed7c2cc1e21e625993860da8d3776e 100644 (file)
--- a/yaffs_summary.c
+++ b/yaffs_summary.c
@@ -29,8 +29,6 @@
 #include "yaffs_getblockinfo.h"
 #include "yaffs_bitmap.h"
 
-#define YAFFS_SUMMARY_VERSION 1
-
 /*
  * The summary is built up in an array of summary tags.
  * This gets written to the last one or two (maybe more) chunks in a block.