X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.h;h=e2b2fb9378afe615beba22b0eb86f3d65a992b99;hp=77bc7e9968c386612d951f818f9e1e627f69c386;hb=refs%2Fheads%2Fcharles_experiment;hpb=53892fe9e3770882fd8f53f1a8a392d875175b4b

diff --git a/yaffs_guts.h b/yaffs_guts.h
index 77bc7e9..e2b2fb9 100644
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -167,6 +167,12 @@ enum yaffs_ecc_result {
 	YAFFS_ECC_RESULT_UNFIXED
 };
 
+/*
+ * Object type enum:
+ * When this is stored in flash we store it as a u32 instead
+ * to prevent any alignment change issues as compiler variants change.
+ */
+
 enum yaffs_obj_type {
 	YAFFS_OBJECT_TYPE_UNKNOWN,
 	YAFFS_OBJECT_TYPE_FILE,
@@ -310,7 +316,7 @@ struct yaffs_block_info {
 /* This is the object structure as stored on NAND */
 
 struct yaffs_obj_hdr {
-	enum yaffs_obj_type type;
+	u32 type;  /* enum yaffs_obj_type  */
 
 	/* Apply to everything  */
 	int parent_obj_id;
@@ -368,9 +374,19 @@ struct yaffs_tnode {
  * - a hard link
  */
 
+/* The file variant has three file sizes:
+ *  - file_size : size of file as written into Yaffs - including data in cache.
+ *  - stored_size - size of file as stored on media.
+ *  - shrink_size - size of file that has been shrunk back to.
+ *
+ * The stored_size and file_size might be different because the data written
+ * into the cache will increase the file_size but the stored_size will only
+ * change when the data is actually stored.
+ *
+ */
 struct yaffs_file_var {
 	loff_t file_size;
-	loff_t scanned_size;
+	loff_t stored_size;
 	loff_t shrink_size;
 	int top_level;
 	struct yaffs_tnode *top;
@@ -470,7 +486,7 @@ struct yaffs_obj {
 
 	void *my_inode;
 
-	enum yaffs_obj_type variant_type;
+	u32 variant_type; /* enum yaffs_object_type */
 
 	union yaffs_obj_var variant;
 
@@ -490,7 +506,7 @@ struct yaffs_checkpt_obj {
 	u32 obj_id;
 	u32 parent_id;
 	int hdr_chunk;
-	enum yaffs_obj_type variant_type:3;
+	u32 variant_type:3; /* enum yaffs_obj_type */
 	u8 deleted:1;
 	u8 soft_del:1;
 	u8 unlinked:1;
@@ -876,10 +892,13 @@ struct yaffs_obj *yaffs_create_file(struct yaffs_obj *parent,
 				    const YCHAR *name, u32 mode, u32 uid,
 				    u32 gid);
 
-int yaffs_flush_file(struct yaffs_obj *obj, int update_time, int data_sync);
+int yaffs_flush_file(struct yaffs_obj *in,
+		     int update_time,
+		     int data_sync,
+		     int discard_cache);
 
 /* Flushing and checkpointing */
-void yaffs_flush_whole_cache(struct yaffs_dev *dev);
+void yaffs_flush_whole_cache(struct yaffs_dev *dev, int discard);
 
 int yaffs_checkpoint_save(struct yaffs_dev *dev);
 int yaffs_checkpoint_restore(struct yaffs_dev *dev);