projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change enums to u32 for stored fields
[yaffs2.git]
/
yaffs_yaffs2.c
diff --git
a/yaffs_yaffs2.c
b/yaffs_yaffs2.c
index f1dc972276f78091b14a45e4ecfd54d1c406a5b1..9fb7c944caca02acbf511e55dbe71d9cf88f573f 100644
(file)
--- a/
yaffs_yaffs2.c
+++ b/
yaffs_yaffs2.c
@@
-1193,12
+1193,14
@@
static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
}
if (!in->valid && in->variant_type !=
}
if (!in->valid && in->variant_type !=
- (oh ? oh->type : tags.extra_obj_type))
+ (oh ? oh->type : tags.extra_obj_type))
{
yaffs_trace(YAFFS_TRACE_ERROR,
yaffs_trace(YAFFS_TRACE_ERROR,
- "yaffs tragedy: Bad
object
type, %d != %d, for object %d at chunk %d during scan",
+ "yaffs tragedy: Bad type, %d != %d, for object %d at chunk %d during scan",
oh ? oh->type : tags.extra_obj_type,
in->variant_type, tags.obj_id,
chunk);
oh ? oh->type : tags.extra_obj_type,
in->variant_type, tags.obj_id,
chunk);
+ in = yaffs_retype_obj(in, oh ? oh->type : tags.extra_obj_type);
+ }
if (!in->valid &&
(tags.obj_id == YAFFS_OBJECTID_ROOT ||
if (!in->valid &&
(tags.obj_id == YAFFS_OBJECTID_ROOT ||
@@
-1349,7
+1351,6
@@
int yaffs2_scan_backwards(struct yaffs_dev *dev)
int n_to_scan = 0;
enum yaffs_block_state state;
int c;
int n_to_scan = 0;
enum yaffs_block_state state;
int c;
- int deleted;
LIST_HEAD(hard_list);
struct yaffs_block_info *bi;
u32 seq_number;
LIST_HEAD(hard_list);
struct yaffs_block_info *bi;
u32 seq_number;
@@
-1439,7
+1440,7
@@
int yaffs2_scan_backwards(struct yaffs_dev *dev)
bi++;
}
bi++;
}
- yaffs_trace(YAFFS_TRACE_
SCAN
, "%d blocks to be sorted...", n_to_scan);
+ yaffs_trace(YAFFS_TRACE_
ALWAYS
, "%d blocks to be sorted...", n_to_scan);
cond_resched();
cond_resched();
@@
-1467,7
+1468,6
@@
int yaffs2_scan_backwards(struct yaffs_dev *dev)
/* get the block to scan in the correct order */
blk = block_index[block_iter].block;
bi = yaffs_get_block_info(dev, blk);
/* get the block to scan in the correct order */
blk = block_index[block_iter].block;
bi = yaffs_get_block_info(dev, blk);
- deleted = 0;
summary_available = yaffs_summary_read(dev, dev->sum_tags, blk);
summary_available = yaffs_summary_read(dev, dev->sum_tags, blk);