/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
{
int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
- T(YAFFS_TRACE_CHECKPOINT,
- (TSTR("checkpt blocks available = %d" TENDSTR), blocks_avail));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+ "checkpt blocks_avail = %d", blocks_avail);
return (blocks_avail <= 0) ? 0 : 1;
}
if (!dev->param.erase_fn)
return 0;
- T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d" TENDSTR),
- dev->internal_start_block,
- dev->internal_end_block));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+ "checking blocks %d to %d",
+ dev->internal_start_block, dev->internal_end_block);
for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
- T(YAFFS_TRACE_CHECKPOINT,
- (TSTR("erasing checkpt block %d" TENDSTR), i));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+ "erasing checkpt block %d", i);
dev->n_erasures++;
if (dev->param.
erase_fn(dev,
- i - dev->block_offset /* realign */ )) {
+ i - dev->block_offset /* realign */)) {
bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
dev->n_erased_blocks++;
dev->n_free_chunks +=
{
int i;
int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
- T(YAFFS_TRACE_CHECKPOINT,
- (TSTR
- ("allocating checkpt block: erased %d reserved %d avail %d next %d "
- TENDSTR), dev->n_erased_blocks, dev->param.n_reserved_blocks,
- blocks_avail, dev->checkpt_next_block));
+
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+ "allocating checkpt block: erased %d reserved %d avail %d next %d ",
+ dev->n_erased_blocks, dev->param.n_reserved_blocks,
+ blocks_avail, dev->checkpt_next_block);
if (dev->checkpt_next_block >= 0 &&
dev->checkpt_next_block <= dev->internal_end_block &&
if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
dev->checkpt_next_block = i + 1;
dev->checkpt_cur_block = i;
- T(YAFFS_TRACE_CHECKPOINT,
- (TSTR("allocating checkpt block %d" TENDSTR),
- i));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+ "allocating checkpt block %d", i);
return;
}
}
}
- T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks" TENDSTR)));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT, "out of checkpt blocks");
dev->checkpt_next_block = -1;
dev->checkpt_cur_block = -1;
int i;
struct yaffs_ext_tags tags;
- T(YAFFS_TRACE_CHECKPOINT,
- (TSTR("find next checkpt block: start: blocks %d next %d" TENDSTR),
- dev->blocks_in_checkpt, dev->checkpt_next_block));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+ "find next checkpt block: start: blocks %d next %d",
+ dev->blocks_in_checkpt, dev->checkpt_next_block);
if (dev->blocks_in_checkpt < dev->checkpt_max_blocks)
for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
dev->param.read_chunk_tags_fn(dev, realigned_chunk,
NULL, &tags);
- T(YAFFS_TRACE_CHECKPOINT,
- (TSTR
- ("find next checkpt block: search: block %d oid %d seq %d eccr %d"
- TENDSTR), i, tags.obj_id, tags.seq_number,
- tags.ecc_result));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+ "find next checkpt block: search: block %d oid %d seq %d eccr %d",
+ i, tags.obj_id, tags.seq_number,
+ tags.ecc_result);
if (tags.seq_number == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
/* Right kind of block */
dev->checkpt_block_list[dev->
blocks_in_checkpt] = i;
dev->blocks_in_checkpt++;
- T(YAFFS_TRACE_CHECKPOINT,
- (TSTR("found checkpt block %d" TENDSTR), i));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+ "found checkpt block %d", i);
return;
}
}
- T(YAFFS_TRACE_CHECKPOINT,
- (TSTR("found no more checkpt blocks" TENDSTR)));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT, "found no more checkpt blocks");
dev->checkpt_next_block = -1;
dev->checkpt_cur_block = -1;
int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
{
+ int i;
dev->checkpt_open_write = writing;
if (!dev->checkpt_buffer)
dev->checkpt_buffer =
- YMALLOC_DMA(dev->param.total_bytes_per_chunk);
+ kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS);
if (!dev->checkpt_buffer)
return 0;
memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
dev->checkpt_byte_offs = 0;
return yaffs_checkpt_erase(dev);
- } else {
- int i;
- /* Set to a value that will kick off a read */
- dev->checkpt_byte_offs = dev->data_bytes_per_chunk;
- /* A checkpoint block list of 1 checkpoint block per 16 block is (hopefully)
- * going to be way more than we need */
- dev->blocks_in_checkpt = 0;
- dev->checkpt_max_blocks =
- (dev->internal_end_block - dev->internal_start_block) / 16 +
- 2;
- dev->checkpt_block_list =
- YMALLOC(sizeof(int) * dev->checkpt_max_blocks);
- if (!dev->checkpt_block_list)
- return 0;
-
- for (i = 0; i < dev->checkpt_max_blocks; i++)
- dev->checkpt_block_list[i] = -1;
}
+ /* Set to a value that will kick off a read */
+ dev->checkpt_byte_offs = dev->data_bytes_per_chunk;
+ /* A checkpoint block list of 1 checkpoint block per 16 block is
+ * (hopefully) going to be way more than we need */
+ 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)
+ return 0;
+
+ for (i = 0; i < dev->checkpt_max_blocks; i++)
+ dev->checkpt_block_list[i] = -1;
+
return 1;
}
int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum)
{
u32 composite_sum;
+
composite_sum = (dev->checkpt_sum << 8) | (dev->checkpt_xor & 0xFF);
*sum = composite_sum;
return 1;
{
int chunk;
int realigned_chunk;
-
struct yaffs_ext_tags tags;
if (dev->checkpt_cur_block < 0) {
dev->checkpt_cur_block * dev->param.chunks_per_block +
dev->checkpt_cur_chunk;
- T(YAFFS_TRACE_CHECKPOINT,
- (TSTR
- ("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
- chunk, dev->checkpt_cur_block, dev->checkpt_cur_chunk, tags.obj_id,
- tags.chunk_id));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+ "checkpoint wite buffer nand %d(%d:%d) objid %d chId %d",
+ chunk, dev->checkpt_cur_block, dev->checkpt_cur_chunk,
+ tags.obj_id, tags.chunk_id);
realigned_chunk = chunk - dev->chunk_offset;
{
int i = 0;
int ok = 1;
-
u8 *data_bytes = (u8 *) data;
if (!dev->checkpt_buffer)
int i = 0;
int ok = 1;
struct yaffs_ext_tags tags;
-
int chunk;
int realigned_chunk;
-
u8 *data_bytes = (u8 *) data;
if (!dev->checkpt_buffer)
dev->checkpt_cur_chunk = 0;
}
- if (dev->checkpt_cur_block < 0)
+ if (dev->checkpt_cur_block < 0) {
ok = 0;
- else {
- chunk = dev->checkpt_cur_block *
- dev->param.chunks_per_block +
- dev->checkpt_cur_chunk;
-
- realigned_chunk = chunk - dev->chunk_offset;
-
- dev->n_page_reads++;
-
- /* read in the next chunk */
- dev->param.read_chunk_tags_fn(dev,
- realigned_chunk,
- dev->
- checkpt_buffer,
- &tags);
-
- 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;
-
- dev->checkpt_byte_offs = 0;
- dev->checkpt_page_seq++;
- dev->checkpt_cur_chunk++;
-
- if (dev->checkpt_cur_chunk >=
- dev->param.chunks_per_block)
- dev->checkpt_cur_block = -1;
+ break;
}
- }
- if (ok) {
- *data_bytes =
- dev->checkpt_buffer[dev->checkpt_byte_offs];
- dev->checkpt_sum += *data_bytes;
- dev->checkpt_xor ^= *data_bytes;
- dev->checkpt_byte_offs++;
- i++;
- data_bytes++;
- dev->checkpt_byte_count++;
+ chunk = dev->checkpt_cur_block *
+ dev->param.chunks_per_block +
+ dev->checkpt_cur_chunk;
+
+ realigned_chunk = chunk - dev->chunk_offset;
+ dev->n_page_reads++;
+
+ /* read in the next chunk */
+ dev->param.read_chunk_tags_fn(dev,
+ realigned_chunk,
+ dev->checkpt_buffer,
+ &tags);
+
+ 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;
+ break;
+ }
+
+ dev->checkpt_byte_offs = 0;
+ dev->checkpt_page_seq++;
+ dev->checkpt_cur_chunk++;
+
+ if (dev->checkpt_cur_chunk >=
+ dev->param.chunks_per_block)
+ dev->checkpt_cur_block = -1;
}
+
+ *data_bytes = dev->checkpt_buffer[dev->checkpt_byte_offs];
+ dev->checkpt_sum += *data_bytes;
+ dev->checkpt_xor ^= *data_bytes;
+ dev->checkpt_byte_offs++;
+ i++;
+ data_bytes++;
+ dev->checkpt_byte_count++;
}
return i;
int yaffs_checkpt_close(struct yaffs_dev *dev)
{
+ int i;
if (dev->checkpt_open_write) {
if (dev->checkpt_byte_offs != 0)
yaffs2_checkpt_flush_buffer(dev);
} else if (dev->checkpt_block_list) {
- int i;
for (i = 0;
- i < dev->blocks_in_checkpt
- && dev->checkpt_block_list[i] >= 0; i++) {
+ i < dev->blocks_in_checkpt &&
+ dev->checkpt_block_list[i] >= 0; i++) {
int blk = dev->checkpt_block_list[i];
struct yaffs_block_info *bi = NULL;
- if (dev->internal_start_block <= blk
- && blk <= dev->internal_end_block)
+
+ if (dev->internal_start_block <= blk &&
+ blk <= dev->internal_end_block)
bi = yaffs_get_block_info(dev, blk);
if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY)
bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
- else {
- /* Todo this looks odd... */
- }
}
- YFREE(dev->checkpt_block_list);
+ kfree(dev->checkpt_block_list);
dev->checkpt_block_list = NULL;
}
dev->n_free_chunks -=
- dev->blocks_in_checkpt * dev->param.chunks_per_block;
+ dev->blocks_in_checkpt * dev->param.chunks_per_block;
dev->n_erased_blocks -= dev->blocks_in_checkpt;
- T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
- dev->checkpt_byte_count));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT, "checkpoint byte count %d",
+ dev->checkpt_byte_count);
if (dev->checkpt_buffer) {
/* free the buffer */
- YFREE(dev->checkpt_buffer);
+ kfree(dev->checkpt_buffer);
dev->checkpt_buffer = NULL;
return 1;
- } else
+ } else {
return 0;
+ }
}
int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev)
{
/* Erase the checkpoint data */
- T(YAFFS_TRACE_CHECKPOINT,
- (TSTR("checkpoint invalidate of %d blocks" TENDSTR),
- dev->blocks_in_checkpt));
+ yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+ "checkpoint invalidate of %d blocks",
+ dev->blocks_in_checkpt);
return yaffs_checkpt_erase(dev);
}
projects / yaffs2.git / blobdiff