*** empty log message ***

[yaffs/.git] / yaffs_guts.h

diff --git a/yaffs_guts.h b/yaffs_guts.h
index 769dcc50adc2a7706012569b9d54c96bc8dbc64e..37287224d4cf4bac6c5ac8d258e2f9f88a756cae 100644 (file)
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -14,14 +14,13 @@
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  *
- * $Id: yaffs_guts.h,v 1.16 2003-01-31 03:30:33 charles Exp $
+ * $Id: yaffs_guts.h,v 1.20 2005-06-25 03:22:24 charles Exp $
  */
 
 #ifndef __YAFFS_GUTS_H__
 #define __YAFFS_GUTS_H__
 
-#include "devextras.h"
-
+#include "yportenv.h"
 
 #define YAFFS_OK       1
 #define YAFFS_FAIL  0
@@ -163,8 +162,8 @@ typedef struct
 #ifndef CONFIG_YAFFS_NO_YAFFS2
        __u32 sequenceNumber;   // block sequence number for yaffs2
 #endif
-       int   softDeletions:8;  // number of soft deleted pages
-    int   pagesInUse:8;                // number of pages in use
+       int   softDeletions:12; // number of soft deleted pages
+    int   pagesInUse:12;       // number of pages in use
     __u32 blockState:4;        // One of the above block states
     __u32 needsRetiring:1;     // Data has failed on this block, need to get valid data off
                                                // and retire the block.
@@ -361,6 +360,8 @@ struct  yaffs_ObjectStruct
 
 #ifdef __KERNEL__
        struct inode *myInode;
+       __u8  deferedFree;   // YAFFS has removed the object from NAND, but it is being kept
+                            // Alive until the inode is cleared to prevent inode inconsistencies.
 #endif
 
 
@@ -397,7 +398,7 @@ struct yaffs_DeviceStruct
 {
        // Entry parameters set up way early. Yaffs sets up the rest.
        int   nBytesPerChunk;    // Should be a power of 2 >= 512
-       int       nChunksPerBlock;       // does not need to be a power of 2
+       int   nChunksPerBlock;   // does not need to be a power of 2
        int   startBlock;                // Start block we're allowed to use
        int   endBlock;                  // End block we're allowed to use
        int   nReservedBlocks;   // We want this tuneable so that we can reduce
@@ -419,6 +420,11 @@ struct yaffs_DeviceStruct
        int (*initialiseNAND)(struct yaffs_DeviceStruct *dev);
 
        // Runtime parameters. Set up by YAFFS.
+       int   internalStartBlock;                // Internal version of startBlock
+       int   internalEndBlock;                  // End block we're allowed to use
+       int   blockOffset;
+       int   chunkOffset;
+       
        
        __u16 chunkGroupBits; // 0 for devices <= 32MB. else log2(nchunks) - 16
        __u16 chunkGroupSize; // == 2^^chunkGroupBits
@@ -576,6 +582,9 @@ yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
 void  yfsd_WinFileTimeNow(__u32 target[2]);
 #endif
 
+#ifdef __KERNEL__
+void yaffs_HandleDeferedFree(yaffs_Object *obj);
+#endif
 
 // Debug dump 
 int yaffs_DumpObject(yaffs_Object *obj);
@@ -586,3 +595,4 @@ void yaffs_GutsTest(yaffs_Device *dev);
 
 #endif
 
+