projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up some compilation warnings for VxWorks
[yaffs2.git]
/
yaffs_verify.c
diff --git
a/yaffs_verify.c
b/yaffs_verify.c
index b3e540dd52a3656c223587431bda39b76b56e502..7a341a283079f0d98a84f566f4d86fac3193a8fd 100644
(file)
--- a/
yaffs_verify.c
+++ b/
yaffs_verify.c
@@
-19,20
+19,20
@@
int yaffs_skip_verification(struct yaffs_dev *dev)
{
int yaffs_skip_verification(struct yaffs_dev *dev)
{
-
dev =
dev;
+
(void)
dev;
return !(yaffs_trace_mask &
(YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
}
static int yaffs_skip_full_verification(struct yaffs_dev *dev)
{
return !(yaffs_trace_mask &
(YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
}
static int yaffs_skip_full_verification(struct yaffs_dev *dev)
{
-
dev =
dev;
+
(void)
dev;
return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL));
}
static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
{
return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL));
}
static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
{
-
dev =
dev;
+
(void)
dev;
return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND));
}
return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND));
}
@@
-77,10
+77,10
@@
void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
actually_used = bi->pages_in_use - bi->soft_del_pages;
if (bi->pages_in_use < 0 ||
actually_used = bi->pages_in_use - bi->soft_del_pages;
if (bi->pages_in_use < 0 ||
- bi->pages_in_use > dev->param.chunks_per_block ||
+ bi->pages_in_use >
(int)
dev->param.chunks_per_block ||
bi->soft_del_pages < 0 ||
bi->soft_del_pages < 0 ||
- bi->soft_del_pages > dev->param.chunks_per_block ||
- actually_used < 0 || actually_used > dev->param.chunks_per_block)
+ bi->soft_del_pages >
(int)
dev->param.chunks_per_block ||
+ actually_used < 0 || actually_used >
(int)
dev->param.chunks_per_block)
yaffs_trace(YAFFS_TRACE_VERIFY,
"Block %d has illegal values pages_in_used %d soft_del_pages %d",
n, bi->pages_in_use, bi->soft_del_pages);
yaffs_trace(YAFFS_TRACE_VERIFY,
"Block %d has illegal values pages_in_used %d soft_del_pages %d",
n, bi->pages_in_use, bi->soft_del_pages);
@@
-110,8
+110,8
@@
void yaffs_verify_collected_blk(struct yaffs_dev *dev,
void yaffs_verify_blocks(struct yaffs_dev *dev)
{
void yaffs_verify_blocks(struct yaffs_dev *dev)
{
-
int
i;
-
int
state_count[YAFFS_NUMBER_OF_BLOCK_STATES];
+
u32
i;
+
u32
state_count[YAFFS_NUMBER_OF_BLOCK_STATES];
int illegal_states = 0;
if (yaffs_skip_verification(dev))
int illegal_states = 0;
if (yaffs_skip_verification(dev))
@@
-149,7
+149,7
@@
void yaffs_verify_blocks(struct yaffs_dev *dev)
dev->blocks_in_checkpt,
state_count[YAFFS_BLOCK_STATE_CHECKPOINT]);
dev->blocks_in_checkpt,
state_count[YAFFS_BLOCK_STATE_CHECKPOINT]);
- if (dev->n_erased_blocks != state_count[YAFFS_BLOCK_STATE_EMPTY])
+ if (dev->n_erased_blocks !=
(int)
state_count[YAFFS_BLOCK_STATE_EMPTY])
yaffs_trace(YAFFS_TRACE_VERIFY,
"Erased block count wrong dev %d count %d",
dev->n_erased_blocks,
yaffs_trace(YAFFS_TRACE_VERIFY,
"Erased block count wrong dev %d count %d",
dev->n_erased_blocks,
@@
-201,7
+201,7
@@
void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh,
tags->obj_id, oh->parent_obj_id);
if (parent_check && obj->parent &&
tags->obj_id, oh->parent_obj_id);
if (parent_check && obj->parent &&
- oh->parent_obj_id != obj->parent->obj_id &&
+ oh->parent_obj_id !=
obj->parent->obj_id &&
(oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED ||
obj->parent->obj_id != YAFFS_OBJECTID_DELETED))
yaffs_trace(YAFFS_TRACE_VERIFY,
(oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED ||
obj->parent->obj_id != YAFFS_OBJECTID_DELETED))
yaffs_trace(YAFFS_TRACE_VERIFY,
@@
-222,12
+222,13
@@
void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh,
void yaffs_verify_file(struct yaffs_obj *obj)
{
void yaffs_verify_file(struct yaffs_obj *obj)
{
+ u32 x;
int required_depth;
int required_depth;
- int
actual_depth
;
- u32
last
_chunk;
+ int
last_chunk
;
+ u32
offset_in
_chunk;
u32 the_chunk;
u32 the_chunk;
- u32 x;
-
u32
i;
+
+
int
i;
struct yaffs_dev *dev;
struct yaffs_ext_tags tags;
struct yaffs_tnode *tn;
struct yaffs_dev *dev;
struct yaffs_ext_tags tags;
struct yaffs_tnode *tn;
@@
-242,9
+243,11
@@
void yaffs_verify_file(struct yaffs_obj *obj)
dev = obj->my_dev;
obj_id = obj->obj_id;
dev = obj->my_dev;
obj_id = obj->obj_id;
+
/* Check file size is consistent with tnode depth */
/* Check file size is consistent with tnode depth */
- last_chunk =
- obj->variant.file_variant.file_size / dev->data_bytes_per_chunk + 1;
+ yaffs_addr_to_chunk(dev, obj->variant.file_variant.file_size,
+ &last_chunk, &offset_in_chunk);
+ last_chunk++;
x = last_chunk >> YAFFS_TNODES_LEVEL0_BITS;
required_depth = 0;
while (x > 0) {
x = last_chunk >> YAFFS_TNODES_LEVEL0_BITS;
required_depth = 0;
while (x > 0) {
@@
-252,8
+255,6
@@
void yaffs_verify_file(struct yaffs_obj *obj)
required_depth++;
}
required_depth++;
}
- actual_depth = obj->variant.file_variant.top_level;
-
/* Check that the chunks in the tnode tree are all correct.
* We do this by scanning through the tnode tree and
* checking the tags for every chunk match.
/* Check that the chunks in the tnode tree are all correct.
* We do this by scanning through the tnode tree and
* checking the tags for every chunk match.
@@
-272,7
+273,7
@@
void yaffs_verify_file(struct yaffs_obj *obj)
if (the_chunk > 0) {
yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
&tags);
if (the_chunk > 0) {
yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
&tags);
- if (tags.obj_id != obj_id || tags.chunk_id != i)
+ if (tags.obj_id != obj_id || tags.chunk_id !=
(u32)
i)
yaffs_trace(YAFFS_TRACE_VERIFY,
"Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)",
obj_id, i, the_chunk,
yaffs_trace(YAFFS_TRACE_VERIFY,
"Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)",
obj_id, i, the_chunk,
@@
-466,12
+467,26
@@
void yaffs_verify_dir(struct yaffs_obj *directory)
{
struct list_head *lh;
struct yaffs_obj *list_obj;
{
struct list_head *lh;
struct yaffs_obj *list_obj;
+ struct yaffs_dev *dev;
if (!directory) {
BUG();
return;
}
if (!directory) {
BUG();
return;
}
+ dev = directory->my_dev;
+
+ if (!dev) {
+ BUG();
+ return;
+ }
+
+ if (directory == dev->root_dir ||
+ directory == dev->lost_n_found ||
+ directory == dev->unlinked_dir ||
+ directory == dev->del_dir)
+ return;
+
if (yaffs_skip_full_verification(directory->my_dev))
return;
if (yaffs_skip_full_verification(directory->my_dev))
return;
@@
-520,6
+535,6
@@
void yaffs_verify_free_chunks(struct yaffs_dev *dev)
int yaffs_verify_file_sane(struct yaffs_obj *in)
{
int yaffs_verify_file_sane(struct yaffs_obj *in)
{
-
in =
in;
+
(void)
in;
return YAFFS_OK;
}
return YAFFS_OK;
}