projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use IS_ERR to validate return value from get_mtd_device()
[yaffs2.git]
/
yaffs_verify.c
diff --git
a/yaffs_verify.c
b/yaffs_verify.c
index 27d36953bc4b7605c1acba461496de26c9898e6d..e8f2f0a6c2be72ca23141975aab13991bfe1176a 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));
}
@@
-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)
{
void yaffs_verify_file(struct yaffs_obj *obj)
{
+ u32 x;
int required_depth;
int actual_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;
struct yaffs_dev *dev;
struct yaffs_ext_tags tags;
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;
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) {
@@
-349,7
+353,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;
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;
oh = (struct yaffs_obj_hdr *)buffer;
@@
-357,7
+361,7
@@
void yaffs_verify_obj(struct yaffs_obj *obj)
yaffs_verify_oh(obj, oh, &tags, 1);
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 */
}
/* Verify it has a parent */
@@
-520,6
+524,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;
}