X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_verify.c;h=db48e56de96f2dd7f46f1052248b9af65f132f0f;hp=b3e540dd52a3656c223587431bda39b76b56e502;hb=20de150d680c2a84c4a2e0d5f0f354274c7ff9ab;hpb=b4d93e23d5d94ff4de6c5d1f420153661fc6a0b3;ds=sidebyside diff --git a/yaffs_verify.c b/yaffs_verify.c index b3e540d..db48e56 100644 --- a/yaffs_verify.c +++ b/yaffs_verify.c @@ -222,11 +222,13 @@ void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh, void yaffs_verify_file(struct yaffs_obj *obj) { + u32 x; int required_depth; int actual_depth; - u32 last_chunk; + int last_chunk; + u32 offset_in_chunk; u32 the_chunk; - u32 x; + u32 i; struct yaffs_dev *dev; struct yaffs_ext_tags tags; @@ -242,9 +244,11 @@ void yaffs_verify_file(struct yaffs_obj *obj) dev = obj->my_dev; obj_id = obj->obj_id; + /* 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) {