X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_checkptrw.c;h=1304c19c185a56abe8a97204ddc91055fb504669;hp=4481bbcd210550a6b300541fd426bde29469ea69;hb=6db5aca55acb7c8af07c8ec90ba8dd9085ab0895;hpb=3a263f2d5074abcd6129dff4f1bd1a0ab45a04da diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c index 4481bbc..1304c19 100644 --- a/yaffs_checkptrw.c +++ b/yaffs_checkptrw.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2007 Aleph One Ltd. + * Copyright (C) 2002-2010 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning @@ -11,16 +11,12 @@ * published by the Free Software Foundation. */ -const char *yaffs_checkptrw_c_version = - "$Id: yaffs_checkptrw.c,v 1.20 2009-09-09 03:03:01 charles Exp $"; - - #include "yaffs_checkptrw.h" #include "yaffs_getblockinfo.h" static int yaffs_CheckpointSpaceOk(yaffs_Device *dev) { - int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks; + int blocksAvailable = dev->nErasedBlocks - dev->param.nReservedBlocks; T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpt blocks available = %d" TENDSTR), @@ -34,7 +30,7 @@ static int yaffs_CheckpointErase(yaffs_Device *dev) { int i; - if (!dev->eraseBlockInNAND) + if (!dev->param.eraseBlockInNAND) return 0; T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR), dev->internalStartBlock, dev->internalEndBlock)); @@ -46,12 +42,12 @@ static int yaffs_CheckpointErase(yaffs_Device *dev) dev->nBlockErasures++; - if (dev->eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) { + if (dev->param.eraseBlockInNAND(dev, i - dev->blockOffset /* realign */)) { bi->blockState = YAFFS_BLOCK_STATE_EMPTY; dev->nErasedBlocks++; - dev->nFreeChunks += dev->nChunksPerBlock; + dev->nFreeChunks += dev->param.nChunksPerBlock; } else { - dev->markNANDBlockBad(dev, i); + dev->param.markNANDBlockBad(dev, i); bi->blockState = YAFFS_BLOCK_STATE_DEAD; } } @@ -66,10 +62,10 @@ static int yaffs_CheckpointErase(yaffs_Device *dev) static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev) { int i; - int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks; + int blocksAvailable = dev->nErasedBlocks - dev->param.nReservedBlocks; T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR), - dev->nErasedBlocks, dev->nReservedBlocks, blocksAvailable, dev->checkpointNextBlock)); + dev->nErasedBlocks, dev->param.nReservedBlocks, blocksAvailable, dev->checkpointNextBlock)); if (dev->checkpointNextBlock >= 0 && dev->checkpointNextBlock <= dev->internalEndBlock && @@ -101,10 +97,10 @@ static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev) if (dev->blocksInCheckpoint < dev->checkpointMaxBlocks) for (i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++) { - int chunk = i * dev->nChunksPerBlock; + int chunk = i * dev->param.nChunksPerBlock; int realignedChunk = chunk - dev->chunkOffset; - dev->readChunkWithTagsFromNAND(dev, realignedChunk, + dev->param.readChunkWithTagsFromNAND(dev, realignedChunk, NULL, &tags); T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR), i, tags.objectId, tags.sequenceNumber, tags.eccResult)); @@ -130,26 +126,26 @@ static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev) int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting) { + + dev->checkpointOpenForWrite = forWriting; + /* Got the functions we need? */ - if (!dev->writeChunkWithTagsToNAND || - !dev->readChunkWithTagsFromNAND || - !dev->eraseBlockInNAND || - !dev->markNANDBlockBad) + if (!dev->param.writeChunkWithTagsToNAND || + !dev->param.readChunkWithTagsFromNAND || + !dev->param.eraseBlockInNAND || + !dev->param.markNANDBlockBad) return 0; if (forWriting && !yaffs_CheckpointSpaceOk(dev)) return 0; if (!dev->checkpointBuffer) - dev->checkpointBuffer = YMALLOC_DMA(dev->totalBytesPerChunk); + dev->checkpointBuffer = YMALLOC_DMA(dev->param.totalBytesPerChunk); if (!dev->checkpointBuffer) return 0; dev->checkpointPageSequence = 0; - - dev->checkpointOpenForWrite = forWriting; - dev->checkpointByteCount = 0; dev->checkpointSum = 0; dev->checkpointXor = 0; @@ -217,7 +213,7 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev) dev->blocksInCheckpoint++; } - chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk; + chunk = dev->checkpointCurrentBlock * dev->param.nChunksPerBlock + dev->checkpointCurrentChunk; T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR), @@ -227,12 +223,12 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev) dev->nPageWrites++; - dev->writeChunkWithTagsToNAND(dev, realignedChunk, + dev->param.writeChunkWithTagsToNAND(dev, realignedChunk, dev->checkpointBuffer, &tags); dev->checkpointByteOffset = 0; dev->checkpointPageSequence++; dev->checkpointCurrentChunk++; - if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) { + if (dev->checkpointCurrentChunk >= dev->param.nChunksPerBlock) { dev->checkpointCurrentChunk = 0; dev->checkpointCurrentBlock = -1; } @@ -310,7 +306,7 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes) ok = 0; else { chunk = dev->checkpointCurrentBlock * - dev->nChunksPerBlock + + dev->param.nChunksPerBlock + dev->checkpointCurrentChunk; realignedChunk = chunk - dev->chunkOffset; @@ -319,7 +315,7 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes) /* read in the next chunk */ /* printf("read checkpoint page %d\n",dev->checkpointPage); */ - dev->readChunkWithTagsFromNAND(dev, + dev->param.readChunkWithTagsFromNAND(dev, realignedChunk, dev->checkpointBuffer, &tags); @@ -333,7 +329,7 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes) dev->checkpointPageSequence++; dev->checkpointCurrentChunk++; - if (dev->checkpointCurrentChunk >= dev->nChunksPerBlock) + if (dev->checkpointCurrentChunk >= dev->param.nChunksPerBlock) dev->checkpointCurrentBlock = -1; } } @@ -358,11 +354,14 @@ int yaffs_CheckpointClose(yaffs_Device *dev) if (dev->checkpointOpenForWrite) { if (dev->checkpointByteOffset != 0) yaffs_CheckpointFlushBuffer(dev); - } else { + } else if(dev->checkpointBlockList){ int i; for (i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++) { - yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->checkpointBlockList[i]); - if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) + int blk = dev->checkpointBlockList[i]; + yaffs_BlockInfo *bi = NULL; + if( dev->internalStartBlock <= blk && blk <= dev->internalEndBlock) + bi = yaffs_GetBlockInfo(dev, blk); + if (bi && bi->blockState == YAFFS_BLOCK_STATE_EMPTY) bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT; else { /* Todo this looks odd... */ @@ -372,7 +371,7 @@ int yaffs_CheckpointClose(yaffs_Device *dev) dev->checkpointBlockList = NULL; } - dev->nFreeChunks -= dev->blocksInCheckpoint * dev->nChunksPerBlock; + dev->nFreeChunks -= dev->blocksInCheckpoint * dev->param.nChunksPerBlock; dev->nErasedBlocks -= dev->blocksInCheckpoint; @@ -390,12 +389,10 @@ int yaffs_CheckpointClose(yaffs_Device *dev) int yaffs_CheckpointInvalidateStream(yaffs_Device *dev) { - /* Erase the first checksum block */ + /* Erase the checkpoint data */ - T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate"TENDSTR))); - - if (!yaffs_CheckpointSpaceOk(dev)) - return 0; + T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate of %d blocks"TENDSTR), + dev->blocksInCheckpoint)); return yaffs_CheckpointErase(dev); }