projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More clean up
[yaffs2.git]
/
yaffs_yaffs1.c
diff --git
a/yaffs_yaffs1.c
b/yaffs_yaffs1.c
index 3b271c907d85e29d29c98d14fdaabfdd892d77a8..b24cf4f58ec01bc34b2aad63cf424a7ffb1ee819 100644
(file)
--- a/
yaffs_yaffs1.c
+++ b/
yaffs_yaffs1.c
@@
-22,10
+22,9
@@
int yaffs1_scan(struct yaffs_dev *dev)
{
struct yaffs_ext_tags tags;
int yaffs1_scan(struct yaffs_dev *dev)
{
struct yaffs_ext_tags tags;
- int blk;
- int result;
+ u32 blk;
int chunk;
int chunk;
-
int
c;
+
u32
c;
int deleted;
enum yaffs_block_state state;
LIST_HEAD(hard_list);
int deleted;
enum yaffs_block_state state;
LIST_HEAD(hard_list);
@@
-42,7
+41,7
@@
int yaffs1_scan(struct yaffs_dev *dev)
"yaffs1_scan starts intstartblk %d intendblk %d...",
dev->internal_start_block, dev->internal_end_block);
"yaffs1_scan starts intstartblk %d intendblk %d...",
dev->internal_start_block, dev->internal_end_block);
- chunk_data = yaffs_get_temp_buffer(dev
, __LINE__
);
+ chunk_data = yaffs_get_temp_buffer(dev);
dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
@@
-95,7
+94,7
@@
int yaffs1_scan(struct yaffs_dev *dev)
/* Read the tags and decide what to do */
chunk = blk * dev->param.chunks_per_block + c;
/* Read the tags and decide what to do */
chunk = blk * dev->param.chunks_per_block + c;
-
result =
yaffs_rd_chunk_tags_nand(dev, chunk, NULL,
+ yaffs_rd_chunk_tags_nand(dev, chunk, NULL,
&tags);
/* Let's have a good look at this chunk... */
&tags);
/* Let's have a good look at this chunk... */
@@
-161,8
+160,8
@@
int yaffs1_scan(struct yaffs_dev *dev)
tags.n_bytes;
if (in &&
in->variant_type ==
tags.n_bytes;
if (in &&
in->variant_type ==
-
YAFFS_OBJECT_TYPE_FILE &&
- in->variant.file_variant.scanned_size <
+ YAFFS_OBJECT_TYPE_FILE &&
+
(unsigned)
in->variant.file_variant.scanned_size <
endpos) {
in->variant.file_variant.scanned_size =
endpos;
endpos) {
in->variant.file_variant.scanned_size =
endpos;
@@
-181,7
+180,7
@@
int yaffs1_scan(struct yaffs_dev *dev)
yaffs_set_chunk_bit(dev, blk, c);
bi->pages_in_use++;
yaffs_set_chunk_bit(dev, blk, c);
bi->pages_in_use++;
-
result =
yaffs_rd_chunk_tags_nand(dev, chunk,
+ yaffs_rd_chunk_tags_nand(dev, chunk,
chunk_data,
NULL);
chunk_data,
NULL);
@@
-323,11
+322,9
@@
int yaffs1_scan(struct yaffs_dev *dev)
case YAFFS_OBJECT_TYPE_FILE:
if (dev->param.
use_header_file_size)
case YAFFS_OBJECT_TYPE_FILE:
if (dev->param.
use_header_file_size)
-
in->variant.
in->variant.
- file_variant.file_size
- = oh->file_size;
-
+ file_variant.file_size
+ = yaffs_oh_to_size(oh);
break;
case YAFFS_OBJECT_TYPE_HARDLINK:
in->variant.
break;
case YAFFS_OBJECT_TYPE_HARDLINK:
in->variant.
@@
-413,7
+410,7
@@
int yaffs1_scan(struct yaffs_dev *dev)
}
}
}
}
- yaffs_release_temp_buffer(dev, chunk_data
, __LINE__
);
+ yaffs_release_temp_buffer(dev, chunk_data);
if (alloc_failed)
return YAFFS_FAIL;
if (alloc_failed)
return YAFFS_FAIL;