projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
fs
/
yaffs2
/
yaffs_yaffs2.c
diff --git
a/fs/yaffs2/yaffs_yaffs2.c
b/fs/yaffs2/yaffs_yaffs2.c
index f1dc972276f78091b14a45e4ecfd54d1c406a5b1..f76dcaeeb18c5027f1bccd3be136319589a6112d 100644
(file)
--- a/
fs/yaffs2/yaffs_yaffs2.c
+++ b/
fs/yaffs2/yaffs_yaffs2.c
@@
-946,7
+946,6
@@
static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
int is_shrink;
int is_unlinked;
struct yaffs_ext_tags tags;
int is_shrink;
int is_unlinked;
struct yaffs_ext_tags tags;
- int result;
int alloc_failed = 0;
int chunk = blk * dev->param.chunks_per_block + chunk_in_block;
struct yaffs_file_var *file_var;
int alloc_failed = 0;
int chunk = blk * dev->param.chunks_per_block + chunk_in_block;
struct yaffs_file_var *file_var;
@@
-954,12
+953,12
@@
static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
struct yaffs_symlink_var *sl_var;
if (summary_available) {
struct yaffs_symlink_var *sl_var;
if (summary_available) {
-
result =
yaffs_summary_fetch(dev, &tags, chunk_in_block);
+ yaffs_summary_fetch(dev, &tags, chunk_in_block);
tags.seq_number = bi->seq_number;
}
if (!summary_available || tags.obj_id == 0) {
tags.seq_number = bi->seq_number;
}
if (!summary_available || tags.obj_id == 0) {
-
result =
yaffs_rd_chunk_tags_nand(dev, chunk, NULL, &tags);
+ yaffs_rd_chunk_tags_nand(dev, chunk, NULL, &tags);
dev->tags_used++;
} else {
dev->summary_used++;
dev->tags_used++;
} else {
dev->summary_used++;
@@
-1114,10
+1113,7
@@
static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
* invalid data until needed.
*/
* invalid data until needed.
*/
- result = yaffs_rd_chunk_tags_nand(dev,
- chunk,
- chunk_data,
- NULL);
+ yaffs_rd_chunk_tags_nand(dev, chunk, chunk_data, NULL);
oh = (struct yaffs_obj_hdr *)chunk_data;
oh = (struct yaffs_obj_hdr *)chunk_data;
@@
-1349,7
+1345,6
@@
int yaffs2_scan_backwards(struct yaffs_dev *dev)
int n_to_scan = 0;
enum yaffs_block_state state;
int c;
int n_to_scan = 0;
enum yaffs_block_state state;
int c;
- int deleted;
LIST_HEAD(hard_list);
struct yaffs_block_info *bi;
u32 seq_number;
LIST_HEAD(hard_list);
struct yaffs_block_info *bi;
u32 seq_number;
@@
-1467,7
+1462,6
@@
int yaffs2_scan_backwards(struct yaffs_dev *dev)
/* get the block to scan in the correct order */
blk = block_index[block_iter].block;
bi = yaffs_get_block_info(dev, blk);
/* get the block to scan in the correct order */
blk = block_index[block_iter].block;
bi = yaffs_get_block_info(dev, blk);
- deleted = 0;
summary_available = yaffs_summary_read(dev, dev->sum_tags, blk);
summary_available = yaffs_summary_read(dev, dev->sum_tags, blk);