X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_linux.h;h=c20ab14b7fa2355cffbb0f6ac23debaf06f9f1b4;hp=a8e3f8502dd83e047068c2b016c530e1cf6458f9;hb=5bc32d099123b2e0e5f27f7421caa5413d3211f0;hpb=f330fefa27f2c87f7dff414fe6227261327663b7

diff --git a/yaffs_linux.h b/yaffs_linux.h
index a8e3f85..c20ab14 100644
--- a/yaffs_linux.h
+++ b/yaffs_linux.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -16,28 +16,33 @@
 #ifndef __YAFFS_LINUX_H__
 #define __YAFFS_LINUX_H__
 
-#include "devextras.h"
 #include "yportenv.h"
 
 struct yaffs_linux_context {
-	struct ylist_head	context_list; /* List of these we have mounted */
-	struct yaffs_dev_s *dev;
-	struct super_block * super;
-	struct task_struct *bg_thread; /* Background thread for this device */
+	struct list_head context_list;	/* List of these we have mounted */
+	struct yaffs_dev *dev;
+	struct super_block *super;
+	struct task_struct *bg_thread;	/* Background thread for this device */
 	int bg_running;
-        struct semaphore gross_lock;     /* Gross locking semaphore */
-	__u8 *spare_buffer;      /* For mtdif2 use. Don't know the size of the buffer
+	struct mutex gross_lock;	/* Gross locking mutex*/
+	u8 *spare_buffer;	/* For mtdif2 use. Don't know the buffer size
 				 * at compile time so we have to allocate it.
 				 */
-	struct ylist_head search_contexts;
-	void (*put_super_fn)(struct super_block *sb);
-
+	struct list_head search_contexts;
 	struct task_struct *readdir_process;
 	unsigned mount_id;
+	int dirty;
 };
 
 #define yaffs_dev_to_lc(dev) ((struct yaffs_linux_context *)((dev)->os_context))
 #define yaffs_dev_to_mtd(dev) ((struct mtd_info *)((dev)->driver_context))
 
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+#define WRITE_SIZE_STR "writesize"
+#define WRITE_SIZE(mtd) ((mtd)->writesize)
+#else
+#define WRITE_SIZE_STR "oobblock"
+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
 #endif
 
+#endif