X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_linux.h;h=3b508cbc4e8a87133928fa82d2e0e15e75a534e8;hp=f18c697c180320d3dc402708b964f0fb6e59912c;hb=2870702e0b0f4342857222a36ffcb21886c7f4bf;hpb=f9cb4ba6cdd270bf21d76dcb8e8381a9c143f670;ds=sidebyside

diff --git a/yaffs_linux.h b/yaffs_linux.h
index f18c697..3b508cb 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-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -16,27 +16,26 @@
 #ifndef __YAFFS_LINUX_H__
 #define __YAFFS_LINUX_H__
 
-#include "devextras.h"
 #include "yportenv.h"
 
-struct yaffs_LinuxContext {
-	struct ylist_head	contextList; /* List of these we have mounted */
-	struct yaffs_DeviceStruct *dev;
-	struct super_block * superBlock;
-	struct task_struct *bgThread; /* Background thread for this device */
-	int bgRunning;
-        struct semaphore grossLock;     /* Gross locking semaphore */
-	__u8 *spareBuffer;      /* For mtdif2 use. Don't know the size of the buffer
+struct yaffs_linux_context {
+	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 mutex gross_lock;	/* Gross locking mutex*/
+	u8 *spare_buffer;	/* For mtdif2 use. Don't know the size of the buffer
 				 * at compile time so we have to allocate it.
 				 */
-	struct mtd_info *mtd;
-	struct ylist_head searchContexts;
-	void (*putSuperFunc)(struct super_block *sb);
+	struct list_head search_contexts;
+	void (*put_super_fn) (struct super_block * sb);
 
-	struct task_struct *readdirProcess;
+	struct task_struct *readdir_process;
+	unsigned mount_id;
 };
 
-#define yaffs_DeviceToContext(dev) ((struct yaffs_LinuxContext *)((dev)->context))
+#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))
 
 #endif
-