projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[kernel] nuke trailing whitespaces in the yaffs code
[openwrt.git] / target / linux / generic-2.6 / files-2.6.25 / fs / yaffs2 / yaffs_checkptrw.c
diff --git a/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_checkptrw.c b/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_checkptrw.c
index 2f3f875..933a33f 100644 (file)
--- a/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_checkptrw.c
+++ b/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_checkptrw.c
@@ -22,27 +22,27 @@ static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
 {
 
        int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
-       
+
        T(YAFFS_TRACE_CHECKPOINT,
                (TSTR("checkpt blocks available = %d" TENDSTR),
                blocksAvailable));
-               
-       
+
+
        return (blocksAvailable <= 0) ? 0 : 1;
 }
 
 
 static int yaffs_CheckpointErase(yaffs_Device *dev)
 {
-       
+
        int i;
-       
 
-       if(!dev->eraseBlockInNAND)      
+
+       if(!dev->eraseBlockInNAND)
                return 0;
        T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
                dev->internalStartBlock,dev->internalEndBlock));
-               
+
        for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
                yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
                if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
@@ -58,9 +58,9 @@ static int yaffs_CheckpointErase(yaffs_Device *dev)
                        }
                }
        }
-       
+
        dev->blocksInCheckpoint = 0;
-       
+
        return 1;
 }
 
@@ -72,11 +72,11 @@ static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev)
        T(YAFFS_TRACE_CHECKPOINT,
                (TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
                dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
-               
+
        if(dev->checkpointNextBlock >= 0 &&
           dev->checkpointNextBlock <= dev->internalEndBlock &&
           blocksAvailable > 0){
-       
+
                for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
                        yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
                        if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
@@ -88,7 +88,7 @@ static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev)
                }
        }
        T(YAFFS_TRACE_CHECKPOINT,(TSTR("out of checkpt blocks"TENDSTR)));
-       
+
        dev->checkpointNextBlock = -1;
        dev->checkpointCurrentBlock = -1;
 }
@@ -97,19 +97,19 @@ static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev)
 {
        int  i;
        yaffs_ExtendedTags tags;
-       
+
        T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
                dev->blocksInCheckpoint, dev->checkpointNextBlock));
-               
-       if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks) 
+
+       if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks)
                for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
                        int chunk = i * dev->nChunksPerBlock;
                        int realignedChunk = chunk - dev->chunkOffset;
 
                        dev->readChunkWithTagsFromNAND(dev,realignedChunk,NULL,&tags);
-                       T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR), 
+                       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));
-                                                     
+
                        if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){
                                /* Right kind of block */
                                dev->checkpointNextBlock = tags.objectId;
@@ -130,7 +130,7 @@ static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev)
 
 int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
 {
-       
+
        /* Got the functions we need? */
        if (!dev->writeChunkWithTagsToNAND ||
            !dev->readChunkWithTagsFromNAND ||
@@ -140,31 +140,31 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
 
        if(forWriting && !yaffs_CheckpointSpaceOk(dev))
                return 0;
-                       
+
        if(!dev->checkpointBuffer)
                dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
        if(!dev->checkpointBuffer)
                return 0;
 
-       
+
        dev->checkpointPageSequence = 0;
-       
+
        dev->checkpointOpenForWrite = forWriting;
-       
+
        dev->checkpointByteCount = 0;
        dev->checkpointSum = 0;
        dev->checkpointXor = 0;
        dev->checkpointCurrentBlock = -1;
        dev->checkpointCurrentChunk = -1;
        dev->checkpointNextBlock = dev->internalStartBlock;
-       
+
        /* Erase all the blocks in the checkpoint area */
        if(forWriting){
                memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
                dev->checkpointByteOffset = 0;
                return yaffs_CheckpointErase(dev);
-               
-               
+
+
        } else {
                int i;
                /* Set to a value that will kick off a read */
@@ -177,7 +177,7 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
                for(i = 0; i < dev->checkpointMaxBlocks; i++)
                        dev->checkpointBlockList[i] = -1;
        }
-       
+
        return 1;
 }
 
@@ -196,15 +196,15 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
        int realignedChunk;
 
        yaffs_ExtendedTags tags;
-       
+
        if(dev->checkpointCurrentBlock < 0){
                yaffs_CheckpointFindNextErasedBlock(dev);
                dev->checkpointCurrentChunk = 0;
        }
-       
+
        if(dev->checkpointCurrentBlock < 0)
                return 0;
-       
+
        tags.chunkDeleted = 0;
        tags.objectId = dev->checkpointNextBlock; /* Hint to next place to look */
        tags.chunkId = dev->checkpointPageSequence + 1;
@@ -217,25 +217,25 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
                bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
                dev->blocksInCheckpoint++;
        }
-       
+
        chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
 
-       
+
        T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-               chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId)); 
-       
+               chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId));
+
        realignedChunk = chunk - dev->chunkOffset;
-       
+
        dev->writeChunkWithTagsToNAND(dev,realignedChunk,dev->checkpointBuffer,&tags);
        dev->checkpointByteOffset = 0;
-       dev->checkpointPageSequence++;     
+       dev->checkpointPageSequence++;
        dev->checkpointCurrentChunk++;
        if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock){
                dev->checkpointCurrentChunk = 0;
                dev->checkpointCurrentBlock = -1;
        }
        memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
-       
+
        return 1;
 }
 
@@ -245,37 +245,37 @@ int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
        int i=0;
        int ok = 1;
 
-       
+
        __u8 * dataBytes = (__u8 *)data;
-       
-       
+
+
 
        if(!dev->checkpointBuffer)
                return 0;
-               
+
        if(!dev->checkpointOpenForWrite)
                return -1;
 
        while(i < nBytes && ok) {
-               
 
-               
+
+
                dev->checkpointBuffer[dev->checkpointByteOffset] = *dataBytes ;
                dev->checkpointSum += *dataBytes;
                dev->checkpointXor ^= *dataBytes;
-                
+
                dev->checkpointByteOffset++;
                i++;
                dataBytes++;
                dev->checkpointByteCount++;
-               
-               
+
+
                if(dev->checkpointByteOffset < 0 ||
-                  dev->checkpointByteOffset >= dev->nDataBytesPerChunk) 
+                  dev->checkpointByteOffset >= dev->nDataBytesPerChunk)
                        ok = yaffs_CheckpointFlushBuffer(dev);
 
        }
-       
+
        return  i;
 }
 
@@ -285,12 +285,12 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
        int ok = 1;
        yaffs_ExtendedTags tags;
 
-       
+
        int chunk;
        int realignedChunk;
 
        __u8 *dataBytes = (__u8 *)data;
-               
+
        if(!dev->checkpointBuffer)
                return 0;
 
@@ -298,31 +298,31 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
                return -1;
 
        while(i < nBytes && ok) {
-       
-       
+
+
                if(dev->checkpointByteOffset < 0 ||
                   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
-                  
+
                        if(dev->checkpointCurrentBlock < 0){
                                yaffs_CheckpointFindNextCheckpointBlock(dev);
                                dev->checkpointCurrentChunk = 0;
                        }
-                       
+
                        if(dev->checkpointCurrentBlock < 0)
                                ok = 0;
                        else {
-                       
-                               chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + 
+
+                               chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock +
                                          dev->checkpointCurrentChunk;
 
                                realignedChunk = chunk - dev->chunkOffset;
 
                                /* read in the next chunk */
                                /* printf("read checkpoint page %d\n",dev->checkpointPage); */
-                               dev->readChunkWithTagsFromNAND(dev, realignedChunk, 
+                               dev->readChunkWithTagsFromNAND(dev, realignedChunk,
                                                               dev->checkpointBuffer,
                                                              &tags);
-                                                     
+
                                if(tags.chunkId != (dev->checkpointPageSequence + 1) ||
                                   tags.sequenceNumber != YAFFS_SEQUENCE_CHECKPOINT_DATA)
                                   ok = 0;
@@ -330,12 +330,12 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
                                dev->checkpointByteOffset = 0;
                                dev->checkpointPageSequence++;
                                dev->checkpointCurrentChunk++;
-                       
+
                                if(dev->checkpointCurrentChunk >= dev->nChunksPerBlock)
                                        dev->checkpointCurrentBlock = -1;
                        }
                }
-               
+
                if(ok){
                        *dataBytes = dev->checkpointBuffer[dev->checkpointByteOffset];
                        dev->checkpointSum += *dataBytes;
@@ -346,14 +346,14 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
                        dev->checkpointByteCount++;
                }
        }
-       
+
        return  i;
 }
 
 int yaffs_CheckpointClose(yaffs_Device *dev)
 {
 
-       if(dev->checkpointOpenForWrite){        
+       if(dev->checkpointOpenForWrite){
                if(dev->checkpointByteOffset != 0)
                        yaffs_CheckpointFlushBuffer(dev);
        } else {
@@ -373,19 +373,19 @@ int yaffs_CheckpointClose(yaffs_Device *dev)
        dev->nFreeChunks -= dev->blocksInCheckpoint * dev->nChunksPerBlock;
        dev->nErasedBlocks -= dev->blocksInCheckpoint;
 
-               
+
        T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint byte count %d" TENDSTR),
                        dev->checkpointByteCount));
-                       
+
        if(dev->checkpointBuffer){
-               /* free the buffer */   
+               /* free the buffer */
                YFREE(dev->checkpointBuffer);
                dev->checkpointBuffer = NULL;
                return 1;
        }
        else
                return 0;
-       
+
 }
 
 int yaffs_CheckpointInvalidateStream(yaffs_Device *dev)
Personal OpenWRT clone
This page took 0.032409 seconds and 4 git commands to generate.