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

[yaffs2.git] / yaffs_summary.c

diff --git a/yaffs_summary.c b/yaffs_summary.c
index 49eaef1afbca461e7cacd884c2a8fe385fd41e40..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.
@@ -214,7 +212,7 @@ int yaffs_summary_read(struct yaffs_dev *dev,
                        tags.obj_id != YAFFS_OBJECTID_SUMMARY ||
                        tags.chunk_used == 0 ||
                        tags.ecc_result > YAFFS_ECC_RESULT_FIXED ||
-                       this_tx != tags.n_bytes)
+                       tags.n_bytes != (this_tx + sizeof(hdr)))
                                result = YAFFS_FAIL;
                if (result != YAFFS_OK)
                        break;