summaryrefslogtreecommitdiff
path: root/yaffs_verify.c
diff options
context:
space:
mode:
Diffstat (limited to 'yaffs_verify.c')
-rw-r--r--yaffs_verify.c75
1 files changed, 36 insertions, 39 deletions
diff --git a/yaffs_verify.c b/yaffs_verify.c
index 55884b9..b3e540d 100644
--- a/yaffs_verify.c
+++ b/yaffs_verify.c
@@ -1,7 +1,7 @@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@ -36,9 +36,9 @@ static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND));
}
-static const char *block_state_name[] = {
+static const char * const block_state_name[] = {
"Unknown",
- "Needs scanning",
+ "Needs scan",
"Scanning",
"Empty",
"Allocating",
@@ -66,7 +66,7 @@ void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
switch (bi->block_state) {
case YAFFS_BLOCK_STATE_UNKNOWN:
case YAFFS_BLOCK_STATE_SCANNING:
- case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
+ case YAFFS_BLOCK_STATE_NEEDS_SCAN:
yaffs_trace(YAFFS_TRACE_VERIFY,
"Block %d has bad run-state %s",
n, block_state_name[bi->block_state]);
@@ -76,11 +76,11 @@ 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
- || bi->pages_in_use > dev->param.chunks_per_block
- || bi->soft_del_pages < 0
- || bi->soft_del_pages > dev->param.chunks_per_block
- || actually_used < 0 || actually_used > dev->param.chunks_per_block)
+ if (bi->pages_in_use < 0 ||
+ bi->pages_in_use > dev->param.chunks_per_block ||
+ bi->soft_del_pages < 0 ||
+ bi->soft_del_pages > dev->param.chunks_per_block ||
+ actually_used < 0 || actually_used > 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);
@@ -91,7 +91,6 @@ void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
yaffs_trace(YAFFS_TRACE_VERIFY,
"Block %d has inconsistent values pages_in_use %d counted chunk bits %d",
n, bi->pages_in_use, in_use);
-
}
void yaffs_verify_collected_blk(struct yaffs_dev *dev,
@@ -215,9 +214,9 @@ void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh,
"Obj %d header name is NULL",
obj->obj_id);
- if (tags->obj_id > 1 && ((u8) (oh->name[0])) == 0xff) /* Trashed name */
+ if (tags->obj_id > 1 && ((u8) (oh->name[0])) == 0xff) /* Junk name */
yaffs_trace(YAFFS_TRACE_VERIFY,
- "Obj %d header name is 0xFF",
+ "Obj %d header name is 0xff",
obj->obj_id);
}
@@ -226,6 +225,7 @@ void yaffs_verify_file(struct yaffs_obj *obj)
int required_depth;
int actual_depth;
u32 last_chunk;
+ u32 the_chunk;
u32 x;
u32 i;
struct yaffs_dev *dev;
@@ -265,17 +265,18 @@ void yaffs_verify_file(struct yaffs_obj *obj)
for (i = 1; i <= last_chunk; i++) {
tn = yaffs_find_tnode_0(dev, &obj->variant.file_variant, i);
- if (tn) {
- u32 the_chunk = yaffs_get_group_base(dev, tn, i);
- 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 (!tn)
+ continue;
+
+ the_chunk = yaffs_get_group_base(dev, tn, i);
+ if (the_chunk > 0) {
+ yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
+ &tags);
+ if (tags.obj_id != obj_id || tags.chunk_id != i)
yaffs_trace(YAFFS_TRACE_VERIFY,
"Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)",
- obj_id, i, the_chunk,
- tags.obj_id, tags.chunk_id);
- }
+ obj_id, i, the_chunk,
+ tags.obj_id, tags.chunk_id);
}
}
}
@@ -305,10 +306,8 @@ void yaffs_verify_special(struct yaffs_obj *obj)
void yaffs_verify_obj(struct yaffs_obj *obj)
{
struct yaffs_dev *dev;
-
u32 chunk_min;
u32 chunk_max;
-
u32 chunk_id_ok;
u32 chunk_in_range;
u32 chunk_wrongly_deleted;
@@ -350,7 +349,7 @@ void yaffs_verify_obj(struct yaffs_obj *obj)
if (chunk_valid && !yaffs_skip_nand_verification(dev)) {
struct yaffs_ext_tags tags;
struct yaffs_obj_hdr *oh;
- u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
+ u8 *buffer = yaffs_get_temp_buffer(dev);
oh = (struct yaffs_obj_hdr *)buffer;
@@ -358,7 +357,7 @@ void yaffs_verify_obj(struct yaffs_obj *obj)
yaffs_verify_oh(obj, oh, &tags, 1);
- yaffs_release_temp_buffer(dev, buffer, __LINE__);
+ yaffs_release_temp_buffer(dev, buffer);
}
/* Verify it has a parent */
@@ -369,8 +368,8 @@ void yaffs_verify_obj(struct yaffs_obj *obj)
}
/* Verify parent is a directory */
- if (obj->parent
- && obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+ if (obj->parent &&
+ obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
yaffs_trace(YAFFS_TRACE_VERIFY,
"Obj %d's parent is not a directory (type %d)",
obj->obj_id, obj->parent->variant_type);
@@ -414,7 +413,7 @@ void yaffs_verify_objects(struct yaffs_dev *dev)
for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
list_for_each(lh, &dev->obj_bucket[i].list) {
- obj = list_entry(lh, struct yaffs_obj, hash_link);
+ obj = list_entry(lh, struct yaffs_obj, hash_link);
yaffs_verify_obj(obj);
}
}
@@ -424,12 +423,11 @@ void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
{
struct list_head *lh;
struct yaffs_obj *list_obj;
-
int count = 0;
if (!obj) {
yaffs_trace(YAFFS_TRACE_ALWAYS, "No object to verify");
- YBUG();
+ BUG();
return;
}
@@ -437,14 +435,14 @@ void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
return;
if (!obj->parent) {
- yaffs_trace(YAFFS_TRACE_ALWAYS, "Object does not have parent" );
- YBUG();
+ yaffs_trace(YAFFS_TRACE_ALWAYS, "Object does not have parent");
+ BUG();
return;
}
if (obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
yaffs_trace(YAFFS_TRACE_ALWAYS, "Parent is not directory");
- YBUG();
+ BUG();
}
/* Iterate through the objects in each hash entry */
@@ -460,7 +458,7 @@ void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
yaffs_trace(YAFFS_TRACE_ALWAYS,
"Object in directory %d times",
count);
- YBUG();
+ BUG();
}
}
@@ -470,7 +468,7 @@ void yaffs_verify_dir(struct yaffs_obj *directory)
struct yaffs_obj *list_obj;
if (!directory) {
- YBUG();
+ BUG();
return;
}
@@ -481,7 +479,7 @@ void yaffs_verify_dir(struct yaffs_obj *directory)
yaffs_trace(YAFFS_TRACE_ALWAYS,
"Directory has wrong type: %d",
directory->variant_type);
- YBUG();
+ BUG();
}
/* Iterate through the objects in each hash entry */
@@ -492,7 +490,7 @@ void yaffs_verify_dir(struct yaffs_obj *directory)
yaffs_trace(YAFFS_TRACE_ALWAYS,
"Object in directory list has wrong parent %p",
list_obj->parent);
- YBUG();
+ BUG();
}
yaffs_verify_obj_in_dir(list_obj);
}
@@ -514,7 +512,7 @@ void yaffs_verify_free_chunks(struct yaffs_dev *dev)
if (difference) {
yaffs_trace(YAFFS_TRACE_ALWAYS,
- "Freechunks verification failure %d %d %d",
+ "Freechunks verification failure %d %d %d",
dev->n_free_chunks, counted, difference);
yaffs_free_verification_failures++;
}
@@ -525,4 +523,3 @@ int yaffs_verify_file_sane(struct yaffs_obj *in)
in = in;
return YAFFS_OK;
}
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 18:54:30 +0000