projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change checkpoint object to using a bitfield
[yaffs2.git]
/
yaffs_checkptrw.c
diff --git
a/yaffs_checkptrw.c
b/yaffs_checkptrw.c
index 4229196d427651c05622e22faf3d3542069e2f28..16ee1e0695c6b468941f4fcd0c6b983324e6d7db 100644
(file)
--- a/
yaffs_checkptrw.c
+++ b/
yaffs_checkptrw.c
@@
-159,7
+159,7
@@
static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
enum yaffs_block_state state;
u32 seq;
enum yaffs_block_state state;
u32 seq;
- dev->t
h
.read_chunk_tags_fn(dev,
+ dev->t
agger
.read_chunk_tags_fn(dev,
apply_chunk_offset(dev, chunk),
NULL, &tags);
yaffs_trace(YAFFS_TRACE_CHECKPOINT,
apply_chunk_offset(dev, chunk),
NULL, &tags);
yaffs_trace(YAFFS_TRACE_CHECKPOINT,
@@
-171,7
+171,7
@@
static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
if (tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
continue;
if (tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
continue;
- dev->t
h
.query_block_fn(dev,
+ dev->t
agger
.query_block_fn(dev,
apply_block_offset(dev, i),
&state, &seq);
if (state == YAFFS_BLOCK_STATE_DEAD)
apply_block_offset(dev, i),
&state, &seq);
if (state == YAFFS_BLOCK_STATE_DEAD)
@@
-200,8
+200,8
@@
int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
dev->checkpt_open_write = writing;
/* Got the functions we need? */
dev->checkpt_open_write = writing;
/* Got the functions we need? */
- if (!dev->t
h
.write_chunk_tags_fn ||
- !dev->t
h
.read_chunk_tags_fn ||
+ if (!dev->t
agger
.write_chunk_tags_fn ||
+ !dev->t
agger
.read_chunk_tags_fn ||
!dev->drv.drv_erase_fn ||
!dev->drv.drv_mark_bad_fn)
return 0;
!dev->drv.drv_erase_fn ||
!dev->drv.drv_mark_bad_fn)
return 0;
@@
-237,8
+237,9
@@
int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
dev->blocks_in_checkpt = 0;
dev->checkpt_max_blocks =
(dev->internal_end_block - dev->internal_start_block) / 16 + 2;
dev->blocks_in_checkpt = 0;
dev->checkpt_max_blocks =
(dev->internal_end_block - dev->internal_start_block) / 16 + 2;
- dev->checkpt_block_list =
- kmalloc(sizeof(int) * dev->checkpt_max_blocks, GFP_NOFS);
+ if (!dev->checkpt_block_list)
+ dev->checkpt_block_list =
+ kmalloc(sizeof(int) * dev->checkpt_max_blocks, GFP_NOFS);
if (!dev->checkpt_block_list)
return 0;
if (!dev->checkpt_block_list)
return 0;
@@
-299,7
+300,7
@@
static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
dev->n_page_writes++;
dev->n_page_writes++;
- dev->t
h
.write_chunk_tags_fn(dev, offset_chunk,
+ dev->t
agger
.write_chunk_tags_fn(dev, offset_chunk,
dev->checkpt_buffer, &tags);
dev->checkpt_page_seq++;
dev->checkpt_cur_chunk++;
dev->checkpt_buffer, &tags);
dev->checkpt_page_seq++;
dev->checkpt_cur_chunk++;
@@
-348,7
+349,6
@@
int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
{
int i = 0;
int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
{
int i = 0;
- int ok = 1;
struct yaffs_ext_tags tags;
int chunk;
int offset_chunk;
struct yaffs_ext_tags tags;
int chunk;
int offset_chunk;
@@
-360,7
+360,7
@@
int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
if (dev->checkpt_open_write)
return -1;
if (dev->checkpt_open_write)
return -1;
- while (i < n_bytes
&& ok
) {
+ while (i < n_bytes) {
if (dev->checkpt_byte_offs < 0 ||
dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
if (dev->checkpt_byte_offs < 0 ||
dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
@@
-370,10
+370,9
@@
int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
dev->checkpt_cur_chunk = 0;
}
dev->checkpt_cur_chunk = 0;
}
- if (dev->checkpt_cur_block < 0) {
- ok = 0;
+ /* Bail out if we can't find a checpoint block */
+ if (dev->checkpt_cur_block < 0)
break;
break;
- }
chunk = dev->checkpt_cur_block *
dev->param.chunks_per_block +
chunk = dev->checkpt_cur_block *
dev->param.chunks_per_block +
@@
-382,22
+381,21
@@
int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
offset_chunk = apply_chunk_offset(dev, chunk);
dev->n_page_reads++;
offset_chunk = apply_chunk_offset(dev, chunk);
dev->n_page_reads++;
- /*
r
ead in the next chunk */
- dev->t
h
.read_chunk_tags_fn(dev,
+ /*
R
ead in the next chunk */
+ dev->t
agger
.read_chunk_tags_fn(dev,
offset_chunk,
dev->checkpt_buffer,
&tags);
offset_chunk,
dev->checkpt_buffer,
&tags);
+ /* Bail out if the chunk is corrupted. */
if (tags.chunk_id != (dev->checkpt_page_seq + 1) ||
tags.ecc_result > YAFFS_ECC_RESULT_FIXED ||
if (tags.chunk_id != (dev->checkpt_page_seq + 1) ||
tags.ecc_result > YAFFS_ECC_RESULT_FIXED ||
- tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA) {
- ok = 0;
+ tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
break;
break;
- }
- if(!yaffs2_checkpt_check_chunk_hdr(dev)) {
- ok = 0;
+
+ /* Bail out if it is not a checkpoint chunk. */
+ if(!yaffs2_checkpt_check_chunk_hdr(dev))
break;
break;
- }
dev->checkpt_page_seq++;
dev->checkpt_cur_chunk++;
dev->checkpt_page_seq++;
dev->checkpt_cur_chunk++;
@@
-417,7
+415,7
@@
int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
dev->checkpt_byte_count++;
}
dev->checkpt_byte_count++;
}
- return i;
+ return i;
/* Number of bytes read */
}
int yaffs_checkpt_close(struct yaffs_dev *dev)
}
int yaffs_checkpt_close(struct yaffs_dev *dev)
@@
-441,8
+439,6
@@
int yaffs_checkpt_close(struct yaffs_dev *dev)
if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY)
bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
}
if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY)
bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
}
- kfree(dev->checkpt_block_list);
- dev->checkpt_block_list = NULL;
}
dev->n_free_chunks -=
}
dev->n_free_chunks -=
@@
-452,14
+448,10
@@
int yaffs_checkpt_close(struct yaffs_dev *dev)
yaffs_trace(YAFFS_TRACE_CHECKPOINT, "checkpoint byte count %d",
dev->checkpt_byte_count);
yaffs_trace(YAFFS_TRACE_CHECKPOINT, "checkpoint byte count %d",
dev->checkpt_byte_count);
- if (dev->checkpt_buffer) {
- /* free the buffer */
- kfree(dev->checkpt_buffer);
- dev->checkpt_buffer = NULL;
+ if (dev->checkpt_buffer)
return 1;
return 1;
- } else {
+ else
return 0;
return 0;
- }
}
int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev)
}
int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev)