yaffs: Merge branch 'python_play'

[yaffs2.git] / yaffs_linux.h

diff --git a/yaffs_linux.h b/yaffs_linux.h
index 54556e07dbbc23ff1e050fbad954bbabbb6b1f61..19d7b824c57cd62ca8d5c3e602056ecdb7202b57 100644 (file)
--- 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>
@@ -21,7 +21,7 @@
 
 struct yaffs_LinuxContext {
        struct ylist_head       contextList; /* List of these we have mounted */
-       struct yaffs_DeviceStruct *dev;
+       struct yaffs_dev_s *dev;
        struct super_block * superBlock;
        struct task_struct *bgThread; /* Background thread for this device */
        int bgRunning;
@@ -29,12 +29,15 @@ struct yaffs_LinuxContext {
        __u8 *spareBuffer;      /* 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 task_struct *readdirProcess;
+       unsigned mount_id;
 };
 
-#define yaffs_DeviceToContext(dev) ((struct yaffs_LinuxContext *)((dev)->context))
+#define yaffs_dev_to_lc(dev) ((struct yaffs_LinuxContext *)((dev)->os_context))
+#define yaffs_dev_to_mtd(dev) ((struct mtd_info *)((dev)->driver_context))
 
 #endif