X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.h;h=cf193914b4044bd2790a6a5d818eb73a7dd9bd35;hp=c58c84bf1f29962c1fcc74ab7596e7942a35330f;hb=a48028210bd3547399ecaed7b0138d6c43a1f547;hpb=9822952036d0edf3076ccb116ef2ef6fd5166c98 diff --git a/yaffs_guts.h b/yaffs_guts.h index c58c84b..cf19391 100644 --- a/yaffs_guts.h +++ b/yaffs_guts.h @@ -63,7 +63,7 @@ #define YAFFS_OBJECT_SPACE 0x40000 -#define YAFFS_CHECKPOINT_VERSION 3 +#define YAFFS_CHECKPOINT_VERSION 4 #ifdef CONFIG_YAFFS_UNICODE #define YAFFS_MAX_NAME_LENGTH 127 @@ -81,12 +81,11 @@ #define YAFFS_OBJECTID_UNLINKED 3 #define YAFFS_OBJECTID_DELETED 4 -/* Sseudo object ids for checkpointing */ +/* Pseudo object ids for checkpointing */ #define YAFFS_OBJECTID_SB_HEADER 0x10 #define YAFFS_OBJECTID_CHECKPOINT_DATA 0x20 #define YAFFS_SEQUENCE_CHECKPOINT_DATA 0x21 -/* */ #define YAFFS_MAX_SHORT_OP_CACHES 20 @@ -119,11 +118,7 @@ typedef struct { int dirty; int nBytes; /* Only valid if the cache is dirty */ int locked; /* Can't push out or flush while locked. */ -#ifdef CONFIG_YAFFS_YAFFS2 __u8 *data; -#else - __u8 data[YAFFS_BYTES_PER_CHUNK]; -#endif } yaffs_ChunkCache; @@ -234,6 +229,8 @@ typedef enum { YAFFS_BLOCK_STATE_UNKNOWN = 0, YAFFS_BLOCK_STATE_SCANNING, + /* Being scanned */ + YAFFS_BLOCK_STATE_NEEDS_SCANNING, /* The block might have something on it (ie it is allocating or full, perhaps empty) * but it needs to be scanned to determine its true state. @@ -249,21 +246,23 @@ typedef enum { /* This block is partially allocated. * At least one page holds valid data. * This is the one currently being used for page - * allocation. Should never be more than one of these + * allocation. Should never be more than one of these. + * If a block is only partially allocated at mount it is treated as full. */ YAFFS_BLOCK_STATE_FULL, /* All the pages in this block have been allocated. + * If a block was only partially allocated when mounted we treat + * it as fully allocated. */ YAFFS_BLOCK_STATE_DIRTY, - /* All pages have been allocated and deleted. + /* The block was full and now all chunks have been deleted. * Erase me, reuse me. */ YAFFS_BLOCK_STATE_CHECKPOINT, - /* This block is assigned to holding checkpoint data. - */ + /* This block is assigned to holding checkpoint data. */ YAFFS_BLOCK_STATE_COLLECTING, /* This block is being garbage collected */ @@ -387,6 +386,7 @@ typedef struct { typedef struct { struct ylist_head children; /* list of child links */ + struct ylist_head dirty; /* Entry for list of dirty directories */ } yaffs_DirectoryStructure; typedef struct { @@ -455,10 +455,6 @@ struct yaffs_ObjectStruct { YCHAR shortName[YAFFS_SHORT_NAME_LENGTH + 1]; #endif -#ifndef __KERNEL__ - __u32 inUse; -#endif - #ifdef CONFIG_YAFFS_WINCE __u32 win_ctime[2]; __u32 win_mtime[2]; @@ -473,10 +469,7 @@ struct yaffs_ObjectStruct { __u32 yst_rdev; -#ifdef __KERNEL__ - struct inode *myInode; - -#endif + void *myInode; yaffs_ObjectType variantType; @@ -535,12 +528,17 @@ typedef struct { /*----------------- Device ---------------------------------*/ -struct yaffs_DeviceStruct { - struct ylist_head devList; +struct yaffs_DeviceParamStruct { const char *name; - /* Entry parameters set up way early. Yaffs sets up the rest.*/ - int nDataBytesPerChunk; /* Should be a power of 2 >= 512 */ + /* + * Entry parameters set up way early. Yaffs sets up the rest. + * The structure should be zeroed out before use so that unused + * and defualt values are zero. + */ + + int inbandTags; /* Use unband tags */ + __u32 totalBytesPerChunk; /* Should be >= 512, does not need to be a power of 2 */ int nChunksPerBlock; /* does not need to be a power of 2 */ int spareBytesPerChunk; /* spare area size */ int startBlock; /* Start block we're allowed to use */ @@ -549,27 +547,22 @@ struct yaffs_DeviceStruct { /* reserved blocks on NOR and RAM. */ - /* Stuff used by the shared space checkpointing mechanism */ - /* If this value is zero, then this mechanism is disabled */ - -/* int nCheckpointReservedBlocks; */ /* Blocks to reserve for checkpoint data */ - - int nShortOpCaches; /* If <= 0, then short op caching is disabled, else - * the number of short op caches (don't use too many) + * the number of short op caches (don't use too many). + * 10 to 20 is a good bet. */ - - int useHeaderFileSize; /* Flag to determine if we should use file sizes from the header */ - int useNANDECC; /* Flag to decide whether or not to use NANDECC on data (yaffs1) */ int noTagsECC; /* Flag to decide whether or not to do ECC on packed tags (yaffs2) */ - - int disableLazyLoad; /* Disable lazy loading on this device */ - void *genericDevice; /* Pointer to device context - * On an mtd this holds the mtd pointer. - */ - void *superBlock; + int isYaffs2; /* Use yaffs2 mode on this device */ + + int emptyLostAndFound; /* Auto-empty lost+found directory on mount */ + + int refreshPeriod; /* How often we should check to do a block refresh */ + + /* Checkpoint control. Can be set before or after initialisation */ + __u8 skipCheckpointRead; + __u8 skipCheckpointWrite; /* NAND access functions (Must be set before calling YAFFS)*/ @@ -596,8 +589,6 @@ struct yaffs_DeviceStruct { yaffs_BlockState *state, __u32 *sequenceNumber); #endif - int isYaffs2; - /* The removeObjectCallback function must be supplied by OS flavours that * need it. * yaffs direct uses it to implement the faster readdir. @@ -605,23 +596,38 @@ struct yaffs_DeviceStruct { */ void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj); - /* Callback to mark the superblock dirsty */ - void (*markSuperBlockDirty)(void *superblock); + /* Callback to mark the superblock dirty */ + void (*markSuperBlockDirty)(struct yaffs_DeviceStruct *dev); + + /* Callback to control garbage collection. */ + unsigned (*gcControl)(struct yaffs_DeviceStruct *dev); + /* Debug control flags. Don't use unless you know what you're doing */ + int useHeaderFileSize; /* Flag to determine if we should use file sizes from the header */ + int disableLazyLoad; /* Disable lazy loading on this device */ int wideTnodesDisabled; /* Set to disable wide tnodes */ + int disableSoftDelete; /* yaffs 1 only: Set to disable the use of softdeletion. */ + + int deferDirectoryUpdate; /* Set to defer directory updates */ + +}; - YCHAR *pathDividers; /* String of legal path dividers */ +typedef struct yaffs_DeviceParamStruct yaffs_DeviceParam; +struct yaffs_DeviceStruct { + struct yaffs_DeviceParamStruct param; - /* End of stuff that must be set before initialisation. */ + /* Context storage. Holds extra OS specific data for this device */ - /* Checkpoint control. Can be set before or after initialisation */ - __u8 skipCheckpointRead; - __u8 skipCheckpointWrite; + void *context; /* Runtime parameters. Set up by YAFFS. */ + int nDataBytesPerChunk; - __u16 chunkGroupBits; /* 0 for devices <= 32MB. else log2(nchunks) - 16 */ + /* Non-wide tnode stuff */ + __u16 chunkGroupBits; /* Number of bits that need to be resolved if + * the tnodes are not wide enough. + */ __u16 chunkGroupSize; /* == 2^^chunkGroupBits */ /* Stuff to support wide tnodes */ @@ -633,26 +639,10 @@ struct yaffs_DeviceStruct { __u32 chunkDiv; /* Divisor after shifting: 1 for power-of-2 sizes */ __u32 chunkMask; /* Mask to use for power-of-2 case */ - /* Stuff to handle inband tags */ - int inbandTags; - __u32 totalBytesPerChunk; -#ifdef __KERNEL__ - - struct semaphore sem; /* Semaphore for waiting on erasure.*/ - struct semaphore grossLock; /* Gross locking semaphore */ - struct rw_semaphore dirLock; /* Lock the directory structure */ - __u8 *spareBuffer; /* For mtdif2 use. Don't know the size of the buffer - * at compile time so we have to allocate it. - - */ - void (*putSuperFunc) (struct super_block *sb); - struct ylist_head searchContexts; - -#endif int isMounted; - + int readOnly; int isCheckpointed; @@ -694,7 +684,6 @@ struct yaffs_DeviceStruct { __u32 allocationPage; int allocationBlockFinder; /* Used to search for next allocation block */ - /* Runtime state */ int nTnodesCreated; yaffs_Tnode *freeTnodes; int nFreeTnodes; @@ -713,6 +702,7 @@ struct yaffs_DeviceStruct { yaffs_ObjectList *allocatedObjectList; yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS]; + __u32 bucketFinder; int nFreeChunks; @@ -721,23 +711,6 @@ struct yaffs_DeviceStruct { __u32 *gcCleanupList; /* objects to delete at the end of a GC. */ int nonAggressiveSkip; /* GC state/mode */ - /* Statistcs */ - int nPageWrites; - int nPageReads; - int nBlockErasures; - int nErasureFailures; - int nGCCopies; - int garbageCollections; - int passiveGarbageCollections; - int nRetriedWrites; - int nRetiredBlocks; - int eccFixed; - int eccUnfixed; - int tagsEccFixed; - int tagsEccUnfixed; - int nDeletions; - int nUnmarkedDeletions; - int hasPendingPrioritisedGCs; /* We think this device might have pending prioritised gcs */ /* Special directories */ @@ -755,8 +728,6 @@ struct yaffs_DeviceStruct { yaffs_ChunkCache *srCache; int srLastUse; - int cacheHits; - /* Stuff for background deletion and unlinked files.*/ yaffs_Object *unlinkedDir; /* Directory where unlinked and deleted files live. */ yaffs_Object *deletedDir; /* Directory where deleted objects are sent to disappear. */ @@ -765,7 +736,6 @@ struct yaffs_DeviceStruct { int nUnlinkedFiles; /* Count of unlinked files. */ int nBackgroundDeletions; /* Count of background deletions. */ - /* Temporary buffer management */ yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS]; int maxTemp; @@ -776,9 +746,33 @@ struct yaffs_DeviceStruct { /* yaffs2 runtime stuff */ unsigned sequenceNumber; /* Sequence number of currently allocating block */ unsigned oldestDirtySequence; - - /* Auto empty lost and found directory on mount */ - int emptyLostAndFound; + + /* Block refreshing */ + int refreshSkip; /* A skip down counter. Refresh happens when this gets to zero. */ + + /* Dirty directory handling */ + struct ylist_head dirtyDirectories; /* List of dirty directories */ + + + /* Statistcs */ + __u32 nPageWrites; + __u32 nPageReads; + __u32 nBlockErasures; + __u32 nErasureFailures; + __u32 nGCCopies; + __u32 garbageCollections; + __u32 passiveGarbageCollections; + __u32 nRetriedWrites; + __u32 nRetiredBlocks; + __u32 eccFixed; + __u32 eccUnfixed; + __u32 tagsEccFixed; + __u32 tagsEccUnfixed; + __u32 nDeletions; + __u32 nUnmarkedDeletions; + __u32 refreshCount; + __u32 cacheHits; + }; typedef struct yaffs_DeviceStruct yaffs_Device; @@ -810,7 +804,6 @@ typedef struct { /* yaffs2 runtime stuff */ unsigned sequenceNumber; /* Sequence number of currently allocating block */ - unsigned oldestDirtySequence; } yaffs_CheckpointDevice; @@ -897,10 +890,11 @@ yaffs_Object *yaffs_LostNFound(yaffs_Device *dev); void yfsd_WinFileTimeNow(__u32 target[2]); #endif -#ifdef __KERNEL__ - void yaffs_HandleDeferedFree(yaffs_Object *obj); -#endif + + +void yaffs_UpdateDirtyDirectories(yaffs_Device *dev); + /* Debug dump */ int yaffs_DumpObject(yaffs_Object *obj); @@ -916,4 +910,5 @@ void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi); __u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo); void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo); + #endif