projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Write object headers with stored file extents
[yaffs2.git]
/
yaffs_yaffs1.c
diff --git
a/yaffs_yaffs1.c
b/yaffs_yaffs1.c
index 3b271c907d85e29d29c98d14fdaabfdd892d77a8..4f2e76878ceab34c27d5bba7162d9042234e9880 100644
(file)
--- a/
yaffs_yaffs1.c
+++ b/
yaffs_yaffs1.c
@@
-42,7
+42,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;
@@
-162,15
+162,15
@@
int yaffs1_scan(struct yaffs_dev *dev)
if (in &&
in->variant_type ==
YAFFS_OBJECT_TYPE_FILE &&
if (in &&
in->variant_type ==
YAFFS_OBJECT_TYPE_FILE &&
- in->variant.file_variant.s
cann
ed_size <
+ in->variant.file_variant.s
tor
ed_size <
endpos) {
endpos) {
- in->variant.file_variant.s
cann
ed_size =
+ in->variant.file_variant.s
tor
ed_size =
endpos;
if (!dev->param.use_header_file_size) {
in->variant.
file_variant.file_size =
in->variant.
endpos;
if (!dev->param.use_header_file_size) {
in->variant.
file_variant.file_size =
in->variant.
- file_variant.s
cann
ed_size;
+ file_variant.s
tor
ed_size;
}
}
}
}
@@
-323,11
+323,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
+411,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;