yaffs: Clean up 64-bit compilation
[yaffs2.git] / yaffs_fs.c
index 0d219f64160fb1e30db673675ac0715ec29c9182..caade8ae1f06931d9290a9286536e30e4abde38a 100644 (file)
  */
 
 const char *yaffs_fs_c_version =
-    "$Id: yaffs_fs.c,v 1.95 2010-02-19 01:19:12 charles Exp $";
+    "$Id: yaffs_fs.c,v 1.102 2010-03-15 23:10:33 charles Exp $";
 extern const char *yaffs_guts_c_version;
 
 #include <linux/version.h>
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))
+#define YAFFS_COMPILE_BACKGROUND
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28))
+#define YAFFS_COMPILE_EXPORTFS
+#endif
+
+
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
 #include <linux/config.h>
 #endif
@@ -52,6 +62,17 @@ extern const char *yaffs_guts_c_version;
 #include <linux/string.h>
 #include <linux/ctype.h>
 
+#ifdef YAFFS_COMPILE_EXPORTFS
+#include <linux/exportfs.h>
+#endif
+
+#ifdef YAFFS_COMPILE_BACKGROUND
+#include <linux/kthread.h>
+#include <linux/delay.h>
+#include <linux/freezer.h>
+#endif
+
+
 #include "asm/div64.h"
 
 
@@ -127,16 +148,19 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
 unsigned int yaffs_traceMask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS;
 unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
 unsigned int yaffs_auto_checkpoint = 1;
+unsigned int yaffs_gc_control = 1;
 
 /* Module Parameters */
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
 module_param(yaffs_traceMask, uint, 0644);
 module_param(yaffs_wr_attempts, uint, 0644);
 module_param(yaffs_auto_checkpoint, uint, 0644);
+module_param(yaffs_gc_control, uint, 0644);
 #else
 MODULE_PARM(yaffs_traceMask, "i");
 MODULE_PARM(yaffs_wr_attempts, "i");
 MODULE_PARM(yaffs_auto_checkpoint, "i");
+MODULE_PARM(yaffs_gc_control, "i");
 #endif
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
@@ -272,6 +296,7 @@ static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
 #else
 static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
 #endif
+static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin);
 
 static struct address_space_operations yaffs_file_address_operations = {
        .readpage = yaffs_readpage,
@@ -364,6 +389,7 @@ static const struct file_operations yaffs_dir_operations = {
        .read = generic_read_dir,
        .readdir = yaffs_readdir,
        .fsync = yaffs_sync_object,
+       .llseek = yaffs_dir_llseek,
 };
 
 static const struct super_operations yaffs_super_ops = {
@@ -381,6 +407,11 @@ static const struct super_operations yaffs_super_ops = {
        .sync_fs = yaffs_sync_fs,
        .write_super = yaffs_write_super,
 };
+
+static unsigned yaffs_gc_control_callback(yaffs_Device *dev)
+{
+       return yaffs_gc_control;
+}
                                                                                                                        
 static void yaffs_GrossLock(yaffs_Device *dev)
 {
@@ -395,6 +426,71 @@ static void yaffs_GrossUnlock(yaffs_Device *dev)
        up(&(yaffs_DeviceToContext(dev)->grossLock));
 }
 
+#ifdef YAFFS_COMPILE_EXPORTFS
+
+static struct inode *
+yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino, uint32_t generation)
+{
+       return Y_IGET(sb, ino);
+}
+
+static struct dentry *
+yaffs2_fh_to_dentry(struct super_block *sb, struct fid *fid, int fh_len, int fh_type)
+{
+       return generic_fh_to_dentry(sb, fid, fh_len, fh_type, yaffs2_nfs_get_inode) ;
+}
+
+static struct dentry *
+ yaffs2_fh_to_parent(struct super_block *sb, struct fid *fid, int fh_len, int fh_type)
+{
+       return generic_fh_to_parent(sb, fid, fh_len, fh_type, yaffs2_nfs_get_inode);
+}
+
+struct dentry *yaffs2_get_parent(struct dentry *dentry)
+{
+
+       struct super_block *sb = dentry->d_inode->i_sb;
+       struct dentry *parent = ERR_PTR(-ENOENT);
+       struct inode *inode;
+       unsigned long parent_ino;
+       yaffs_Object *d_obj;
+       yaffs_Object *parent_obj;
+
+       d_obj = yaffs_InodeToObject(dentry->d_inode);
+
+       if (d_obj) {
+               parent_obj = d_obj->parent;
+               if (parent_obj) {
+                       parent_ino = yaffs_GetObjectInode(parent_obj);
+                       inode = Y_IGET(sb, parent_ino);
+
+                       if (IS_ERR(inode)) {
+                               parent = ERR_CAST(inode);
+                       } else {
+                               parent = d_obtain_alias(inode);
+                               if (!IS_ERR(parent)) {
+                                       parent = ERR_PTR(-ENOMEM);
+                                       iput(inode);
+                               }
+                       }
+               }
+       }
+
+       return parent;
+}
+
+/* Just declare a zero structure as a NULL value implies
+ * using the default functions of expfs.
+ */
+
+static struct export_operations yaffs_export_ops =
+{
+       .fh_to_dentry = yaffs2_fh_to_dentry,
+       .fh_to_parent = yaffs2_fh_to_parent,
+       .get_parent = yaffs2_get_parent,
+} ;
+
+#endif
 
 /*-----------------------------------------------------------------*/
 /* Directory search context allows us to unlock access to yaffs during
@@ -583,7 +679,8 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
 
        yaffs_Device *dev = yaffs_InodeToObject(dir)->myDev;
 
-       yaffs_GrossLock(dev);
+       if(current != yaffs_DeviceToContext(dev)->readdirProcess)
+               yaffs_GrossLock(dev);
 
        T(YAFFS_TRACE_OS,
                ("yaffs_lookup for %d:%s\n",
@@ -595,7 +692,8 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
        obj = yaffs_GetEquivalentObject(obj);   /* in case it was a hardlink */
 
        /* Can't hold gross lock when calling yaffs_get_inode() */
-       yaffs_GrossUnlock(dev);
+       if(current != yaffs_DeviceToContext(dev)->readdirProcess)
+               yaffs_GrossUnlock(dev);
 
        if (obj) {
                T(YAFFS_TRACE_OS,
@@ -966,9 +1064,8 @@ static int yaffs_write_end(struct file *filp, struct address_space *mapping,
        addr = kva + offset_into_page;
 
        T(YAFFS_TRACE_OS,
-               ("yaffs_write_end addr %x pos %x nBytes %d\n",
-               (unsigned) addr,
-               (int)pos, copied));
+               ("yaffs_write_end addr %p pos %x nBytes %d\n",
+               addr,(unsigned)pos, copied));
 
        ret = yaffs_file_write(filp, addr, copied, &pos);
 
@@ -1268,6 +1365,33 @@ static void yaffs_release_space(struct file *f)
        yaffs_GrossUnlock(dev);
 }
 
+
+static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin)
+{
+       long long retval;
+
+       lock_kernel();
+
+       switch (origin){
+       case 2:
+               offset += i_size_read(file->f_path.dentry->d_inode);
+               break;
+       case 1:
+               offset += file->f_pos;
+       }
+       retval = -EINVAL;
+
+       if (offset >= 0){
+               if (offset != file->f_pos)
+                       file->f_pos = offset;
+
+               retval = offset;
+       }
+       unlock_kernel();
+       return retval;
+}
+
+
 static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
 {
        yaffs_Object *obj;
@@ -1285,6 +1409,8 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
 
        yaffs_GrossLock(dev);
 
+       yaffs_DeviceToContext(dev)->readdirProcess = current;
+
        offset = f->f_pos;
 
         sc = yaffs_NewSearch(obj);
@@ -1323,7 +1449,6 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
 
        /* If the directory has changed since the open or last call to
           readdir, rewind to after the 2 canned entries. */
-
        if (f->f_version != inode->i_version) {
                offset = 2;
                f->f_pos = offset;
@@ -1362,6 +1487,8 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
        }
 
 unlock_out:
+       yaffs_DeviceToContext(dev)->readdirProcess = NULL;
+
        yaffs_GrossUnlock(dev);
 out:
         yaffs_EndSearch(sc);
@@ -1369,6 +1496,8 @@ out:
        return retVal;
 }
 
+
+
 /*
  * File creation. Allocate an inode, and we're done..
  */
@@ -1459,6 +1588,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
                        ("yaffs_mknod created object %d count = %d\n",
                        obj->objectId, atomic_read(&inode->i_count)));
                error = 0;
+               yaffs_FillInodeFromObject(dir,parent);
        } else {
                T(YAFFS_TRACE_OS,
                        ("yaffs_mknod failed making object\n"));
@@ -1492,16 +1622,17 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
        int retVal;
 
        yaffs_Device *dev;
+       yaffs_Object *obj;
 
        T(YAFFS_TRACE_OS,
                ("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
                dentry->d_name.name));
-
-       dev = yaffs_InodeToObject(dir)->myDev;
+       obj = yaffs_InodeToObject(dir);
+       dev = obj->myDev;
 
        yaffs_GrossLock(dev);
 
-       retVal = yaffs_Unlink(yaffs_InodeToObject(dir), dentry->d_name.name);
+       retVal = yaffs_Unlink(obj, dentry->d_name.name);
 
        if (retVal == YAFFS_OK) {
                dentry->d_inode->i_nlink--;
@@ -1779,7 +1910,7 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
 
 
 
-static void yaffs_flush_sb_inodes(struct super_block *sb)
+static void yaffs_FlushInodes(struct super_block *sb)
 {
        struct inode *iptr;
        yaffs_Object *obj;
@@ -1793,28 +1924,217 @@ static void yaffs_flush_sb_inodes(struct super_block *sb)
        }
 }
 
-static int yaffs_do_sync_fs(struct super_block *sb)
+
+static void yaffs_FlushSuperBlock(struct super_block *sb, int do_checkpoint)
+{
+       yaffs_Device *dev = yaffs_SuperToDevice(sb);    
+       if(!dev)
+               return;
+       
+       yaffs_FlushInodes(sb);
+       yaffs_UpdateDirtyDirectories(dev);
+       yaffs_FlushEntireDeviceCache(dev);
+       if(do_checkpoint)
+               yaffs_CheckpointSave(dev);
+}
+
+
+static unsigned yaffs_bg_gc_urgency(yaffs_Device *dev)
+{
+       unsigned erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock;
+       struct yaffs_LinuxContext *context = yaffs_DeviceToContext(dev);
+       unsigned scatteredFree = 0; /* Free chunks not in an erased block */
+
+       if(erasedChunks < dev->nFreeChunks)
+               scatteredFree = (dev->nFreeChunks - erasedChunks);
+
+       if(!context->bgRunning)
+               return 0;
+       else if(scatteredFree < (dev->param.nChunksPerBlock * 2))
+               return 0;
+       else if(erasedChunks > dev->nFreeChunks/2)
+               return 0;
+       else if(erasedChunks > dev->nFreeChunks/4)
+               return 1;
+       else
+               return 2;
+}
+
+static int yaffs_do_sync_fs(struct super_block *sb,
+                               int request_checkpoint)
 {
 
        yaffs_Device *dev = yaffs_SuperToDevice(sb);
-       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, ("yaffs_do_sync_fs\n"));
+       unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4);
+       unsigned gc_urgent = yaffs_bg_gc_urgency(dev);
+       int do_checkpoint;
+
+       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
+               ("yaffs_do_sync_fs: gc-urgency %d %s %s%s\n",
+               gc_urgent,
+               sb->s_dirt ? "dirty" : "clean",
+               request_checkpoint ? "checkpoint requested" : "no checkpoint",
+               oneshot_checkpoint ? " one-shot" : "" ));
+
+       yaffs_GrossLock(dev);
+       do_checkpoint = ((request_checkpoint && !gc_urgent) ||
+                       oneshot_checkpoint) &&
+                       !dev->isCheckpointed;
+
+       if (sb->s_dirt || do_checkpoint) {
+               yaffs_FlushSuperBlock(sb, !dev->isCheckpointed && do_checkpoint);
+               sb->s_dirt = 0;
+               if(oneshot_checkpoint)
+                       yaffs_auto_checkpoint &= ~4;
+       }
+       yaffs_GrossUnlock(dev);
+
+       return 0;
+}
+
+/*
+ * yaffs background thread functions .
+ * yaffs_BackgroundThread() the thread function
+ * yaffs_BackgroundStart() launches the background thread.
+ * yaffs_BackgroundStop() cleans up the background thread.
+ *
+ * NB: 
+ * The thread should only run after the yaffs is initialised
+ * The thread should be stopped before yaffs is unmounted.
+ * The thread should not do any writing while the fs is in read only.
+ */
+
+#ifdef YAFFS_COMPILE_BACKGROUND
+
+void yaffs_background_waker(unsigned long data)
+{
+       wake_up_process((struct task_struct *)data);
+}
+
+static int yaffs_BackgroundThread(void *data)
+{
+       yaffs_Device *dev = (yaffs_Device *)data;
+       struct yaffs_LinuxContext *context = yaffs_DeviceToContext(dev);
+       unsigned long now = jiffies;
+       unsigned long next_dir_update = now;
+       unsigned long next_gc = now;
+       unsigned long expires;
+       unsigned int urgency;
+
+       int gcResult;
+       struct timer_list timer;
+
+       T(YAFFS_TRACE_BACKGROUND,
+               ("yaffs_background starting for dev %p\n",
+               (void *)dev));
+
+       set_freezable();
+
+       while(context->bgRunning){
+               T(YAFFS_TRACE_BACKGROUND,
+                       ("yaffs_background\n"));
+
+               if(kthread_should_stop())
+                       break;
+
+               if(try_to_freeze())
+                       continue;
 
-       if (sb->s_dirt) {
                yaffs_GrossLock(dev);
 
-               if (dev) {
-                       yaffs_FlushEntireDeviceCache(dev);
-                       yaffs_flush_sb_inodes(sb);
-                       yaffs_CheckpointSave(dev);
+               now = jiffies;
+
+               if(time_after(now, next_dir_update)){
+                       yaffs_UpdateDirtyDirectories(dev);
+                       next_dir_update = now + HZ;
                }
 
+               if(time_after(now,next_gc)){
+                       if(!dev->isCheckpointed){
+                               urgency = yaffs_bg_gc_urgency(dev);
+                               gcResult = yaffs_BackgroundGarbageCollect(dev, urgency);
+                               if(urgency > 1)
+                                       next_gc = now + HZ/20+1;
+                               else if(urgency > 0)
+                                       next_gc = now + HZ/10+1;
+                               else
+                                       next_gc = now + HZ * 2;
+                       } else /*
+                               * gc not running so set to next_dir_update
+                               * to cut down on wake ups
+                               */
+                               next_gc = next_dir_update;
+               }
                yaffs_GrossUnlock(dev);
+#if 1
+               expires = next_dir_update;
+               if (time_before(next_gc,expires))
+                       expires = next_gc;
+               if(time_before(expires,now))
+                       expires = now + HZ;
+
+               init_timer(&timer);
+               timer.expires = expires+1;
+               timer.data = (unsigned long) current;
+               timer.function = yaffs_background_waker;
+
+                set_current_state(TASK_INTERRUPTIBLE);
+               add_timer(&timer);
+               schedule();
+               del_timer_sync(&timer);
+#else
+               msleep(10);
+#endif
+       }
 
-               sb->s_dirt = 0;
+       return 0;
+}
+
+static int yaffs_BackgroundStart(yaffs_Device *dev)
+{
+       int retval = 0;
+       struct yaffs_LinuxContext *context = yaffs_DeviceToContext(dev);
+
+       context->bgRunning = 1;
+
+       context->bgThread = kthread_run(yaffs_BackgroundThread,
+                               (void *)dev,"yaffs-bg");
+
+       if(IS_ERR(context->bgThread)){
+               retval = PTR_ERR(context->bgThread);
+               context->bgThread = NULL;
+               context->bgRunning = 0;
+       }
+       return retval;
+}
+
+static void yaffs_BackgroundStop(yaffs_Device *dev)
+{
+       struct yaffs_LinuxContext *ctxt = yaffs_DeviceToContext(dev);
+
+       ctxt->bgRunning = 0;
+
+       if( ctxt->bgThread){
+               kthread_stop(ctxt->bgThread);
+               ctxt->bgThread = NULL;
        }
+}
+#else
+static int yaffs_BackgroundThread(void *data)
+{
+       return 0;
+}
+
+static int yaffs_BackgroundStart(yaffs_Device *dev)
+{
        return 0;
 }
 
+static void yaffs_BackgroundStop(yaffs_Device *dev)
+{
+}
+#endif
+
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 static void yaffs_write_super(struct super_block *sb)
@@ -1822,10 +2142,14 @@ static void yaffs_write_super(struct super_block *sb)
 static int yaffs_write_super(struct super_block *sb)
 #endif
 {
+       unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2);
+
+       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
+               ("yaffs_write_super%s\n",
+               request_checkpoint ? " checkpt" : ""));
+
+       yaffs_do_sync_fs(sb, request_checkpoint);
 
-       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, ("yaffs_write_super\n"));
-       if (yaffs_auto_checkpoint >= 2)
-               yaffs_do_sync_fs(sb);
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
        return 0;
 #endif
@@ -1838,10 +2162,13 @@ static int yaffs_sync_fs(struct super_block *sb, int wait)
 static int yaffs_sync_fs(struct super_block *sb)
 #endif
 {
-       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, ("yaffs_sync_fs\n"));
+       unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1);
 
-       if (yaffs_auto_checkpoint >= 1)
-               yaffs_do_sync_fs(sb);
+       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
+               ("yaffs_sync_fs%s\n",
+               request_checkpoint ? " checkpt" : ""));
+
+       yaffs_do_sync_fs(sb, request_checkpoint);
 
        return 0;
 }
@@ -1895,18 +2222,21 @@ static void yaffs_read_inode(struct inode *inode)
        T(YAFFS_TRACE_OS,
                ("yaffs_read_inode for %d\n", (int)inode->i_ino));
 
-       yaffs_GrossLock(dev);
+       if(current != yaffs_DeviceToContext(dev)->readdirProcess)
+               yaffs_GrossLock(dev);
 
        obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
 
        yaffs_FillInodeFromObject(inode, obj);
 
-       yaffs_GrossUnlock(dev);
+       if(current != yaffs_DeviceToContext(dev)->readdirProcess)
+               yaffs_GrossUnlock(dev);
 }
 
 #endif
 
 static YLIST_HEAD(yaffs_context_list);
+struct semaphore yaffs_context_lock;
 
 #if 0 /* not used */
 static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
@@ -1921,9 +2251,7 @@ static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
 
                yaffs_GrossLock(dev);
 
-               yaffs_FlushEntireDeviceCache(dev);
-
-               yaffs_CheckpointSave(dev);
+               yaffs_FlushSuperBlock(sb,1);
 
                if (mtd->sync)
                        mtd->sync(mtd);
@@ -1944,21 +2272,25 @@ static void yaffs_put_super(struct super_block *sb)
 
        T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
 
-       yaffs_GrossLock(dev);
+       T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, ("Shutting down yaffs background thread\n"));
+       yaffs_BackgroundStop(dev);
+       T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, ("yaffs background thread shut down\n"));
 
-       yaffs_FlushEntireDeviceCache(dev);
+       yaffs_GrossLock(dev);
 
-       yaffs_CheckpointSave(dev);
+       yaffs_FlushSuperBlock(sb,1);
 
        if (yaffs_DeviceToContext(dev)->putSuperFunc)
                yaffs_DeviceToContext(dev)->putSuperFunc(sb);
 
+
        yaffs_Deinitialise(dev);
 
        yaffs_GrossUnlock(dev);
 
-       /* we assume this is protected by lock_kernel() in mount/umount */
+       down(&yaffs_context_lock);
        ylist_del_init(&(yaffs_DeviceToContext(dev)->contextList));
+       up(&yaffs_context_lock);
 
        if (yaffs_DeviceToContext(dev)->spareBuffer) {
                YFREE(yaffs_DeviceToContext(dev)->spareBuffer);
@@ -2086,6 +2418,10 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
        sb->s_op = &yaffs_super_ops;
        sb->s_flags |= MS_NOATIME;
 
+#ifdef YAFFS_COMPILE_EXPORTFS
+       sb->s_export_op = &yaffs_export_ops;
+#endif
+
        if (!sb)
                printk(KERN_INFO "yaffs: sb is NULL\n");
        else if (!sb->s_dev)
@@ -2295,12 +2631,25 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
 #ifdef CONFIG_YAFFS_DISABLE_TAGS_ECC
        param->noTagsECC = 1;
 #endif
+
+#ifdef CONFIG_YAFFS_DISABLE_BACKGROUND
+#else
+       param->deferDirectoryUpdate = 1;
+#endif
+
        if(options.tags_ecc_overridden)
                param->noTagsECC = !options.tags_ecc_on;
 
 #ifdef CONFIG_YAFFS_EMPTY_LOST_AND_FOUND
        param->emptyLostAndFound = 1;
 #endif
+
+#ifdef CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING
+       param->refreshPeriod = 0;
+#else
+       param->refreshPeriod = 100;
+#endif
+
        if(options.empty_lost_and_found_overridden)
                param->emptyLostAndFound = options.empty_lost_and_found;
 
@@ -2347,6 +2696,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
        yaffs_DeviceToContext(dev)->putSuperFunc = yaffs_MTDPutSuper;
 
        param->markSuperBlockDirty = yaffs_MarkSuperBlockDirty;
+       param->gcControl = yaffs_gc_control_callback;
 
        yaffs_DeviceToContext(dev)->superBlock= sb;
        
@@ -2363,7 +2713,9 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
        param->skipCheckpointWrite = options.skip_checkpoint_write;
 
        /* we assume this is protected by lock_kernel() in mount/umount */
+       down(&yaffs_context_lock);
        ylist_add_tail(&(yaffs_DeviceToContext(dev)->contextList), &yaffs_context_list);
+       up(&yaffs_context_lock);
 
         /* Directory search handling...*/
         YINIT_LIST_HEAD(&(yaffs_DeviceToContext(dev)->searchContexts));
@@ -2378,6 +2730,13 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
        T(YAFFS_TRACE_OS,
          ("yaffs_read_super: guts initialised %s\n",
           (err == YAFFS_OK) ? "OK" : "FAILED"));
+          
+       if(err == YAFFS_OK)
+               yaffs_BackgroundStart(dev);
+               
+       if(!context->bgThread)
+               param->deferDirectoryUpdate = 0;
+
 
        /* Release lock before yaffs_get_inode() */
        yaffs_GrossUnlock(dev);
@@ -2508,55 +2867,63 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super,
 #endif                         /* CONFIG_YAFFS_YAFFS2 */
 
 static struct proc_dir_entry *my_proc_entry;
+static struct proc_dir_entry *debug_proc_entry;
 
 static char *yaffs_dump_dev_part0(char *buf, yaffs_Device * dev)
 {
        buf += sprintf(buf, "startBlock......... %d\n", dev->param.startBlock);
        buf += sprintf(buf, "endBlock........... %d\n", dev->param.endBlock);
        buf += sprintf(buf, "totalBytesPerChunk. %d\n", dev->param.totalBytesPerChunk);
+       buf += sprintf(buf, "useNANDECC......... %d\n", dev->param.useNANDECC);
+       buf += sprintf(buf, "noTagsECC.......... %d\n", dev->param.noTagsECC);
+       buf += sprintf(buf, "isYaffs2........... %d\n", dev->param.isYaffs2);
+       buf += sprintf(buf, "inbandTags......... %d\n", dev->param.inbandTags);
+       buf += sprintf(buf, "emptyLostAndFound.. %d\n", dev->param.emptyLostAndFound);
+       buf += sprintf(buf, "disableLazyLoad.... %d\n", dev->param.disableLazyLoad);
+       buf += sprintf(buf, "refreshPeriod...... %d\n", dev->param.refreshPeriod);
+       buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->param.nShortOpCaches);
+       buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->param.nReservedBlocks);
+
+       buf += sprintf(buf, "\n");
+
+       return buf;
+}
+
+
+static char *yaffs_dump_dev_part1(char *buf, yaffs_Device * dev)
+{
        buf += sprintf(buf, "nDataBytesPerChunk. %d\n", dev->nDataBytesPerChunk);
        buf += sprintf(buf, "chunkGroupBits..... %d\n", dev->chunkGroupBits);
        buf += sprintf(buf, "chunkGroupSize..... %d\n", dev->chunkGroupSize);
        buf += sprintf(buf, "nErasedBlocks...... %d\n", dev->nErasedBlocks);
-       buf += sprintf(buf, "nReservedBlocks.... %d\n", dev->param.nReservedBlocks);
        buf += sprintf(buf, "blocksInCheckpoint. %d\n", dev->blocksInCheckpoint);
+       buf += sprintf(buf, "\n");
        buf += sprintf(buf, "nTnodesCreated..... %d\n", dev->nTnodesCreated);
        buf += sprintf(buf, "nFreeTnodes........ %d\n", dev->nFreeTnodes);
        buf += sprintf(buf, "nObjectsCreated.... %d\n", dev->nObjectsCreated);
        buf += sprintf(buf, "nFreeObjects....... %d\n", dev->nFreeObjects);
        buf += sprintf(buf, "nFreeChunks........ %d\n", dev->nFreeChunks);
-       buf += sprintf(buf, "nPageWrites........ %d\n", dev->nPageWrites);
-       buf += sprintf(buf, "nPageReads......... %d\n", dev->nPageReads);
-       buf += sprintf(buf, "nBlockErasures..... %d\n", dev->nBlockErasures);
-       buf += sprintf(buf, "nGCCopies.......... %d\n", dev->nGCCopies);
-       buf += sprintf(buf, "garbageCollections. %d\n", dev->garbageCollections);
-       buf += sprintf(buf, "passiveGCs......... %d\n",
-                   dev->passiveGarbageCollections);
-       buf += sprintf(buf, "nRetriedWrites..... %d\n", dev->nRetriedWrites);
-       buf += sprintf(buf, "nShortOpCaches..... %d\n", dev->param.nShortOpCaches);
-       buf += sprintf(buf, "nRetireBlocks...... %d\n", dev->nRetiredBlocks);
-       buf += sprintf(buf, "eccFixed........... %d\n", dev->eccFixed);
-       buf += sprintf(buf, "eccUnfixed......... %d\n", dev->eccUnfixed);
-       buf += sprintf(buf, "tagsEccFixed....... %d\n", dev->tagsEccFixed);
-       buf += sprintf(buf, "tagsEccUnfixed..... %d\n", dev->tagsEccUnfixed);
-       buf += sprintf(buf, "cacheHits.......... %d\n", dev->cacheHits);
-       buf += sprintf(buf, "nDeletedFiles...... %d\n", dev->nDeletedFiles);
-       buf += sprintf(buf, "nUnlinkedFiles..... %d\n", dev->nUnlinkedFiles);
+       buf += sprintf(buf, "\n");
+       buf += sprintf(buf, "nPageWrites........ %u\n", dev->nPageWrites);
+       buf += sprintf(buf, "nPageReads......... %u\n", dev->nPageReads);
+       buf += sprintf(buf, "nBlockErasures..... %u\n", dev->nBlockErasures);
+       buf += sprintf(buf, "nGCCopies.......... %u\n", dev->nGCCopies);
+       buf += sprintf(buf, "allGCs............. %u\n", dev->allGCs);
+       buf += sprintf(buf, "passiveGCs......... %u\n", dev->passiveGCs);
+       buf += sprintf(buf, "oldestDirtyGCs..... %u\n", dev->oldestDirtyGCs);
+       buf += sprintf(buf, "backgroundGCs...... %u\n", dev->backgroundGCs);
+       buf += sprintf(buf, "nRetriedWrites..... %u\n", dev->nRetriedWrites);
+       buf += sprintf(buf, "nRetireBlocks...... %u\n", dev->nRetiredBlocks);
+       buf += sprintf(buf, "eccFixed........... %u\n", dev->eccFixed);
+       buf += sprintf(buf, "eccUnfixed......... %u\n", dev->eccUnfixed);
+       buf += sprintf(buf, "tagsEccFixed....... %u\n", dev->tagsEccFixed);
+       buf += sprintf(buf, "tagsEccUnfixed..... %u\n", dev->tagsEccUnfixed);
+       buf += sprintf(buf, "cacheHits.......... %u\n", dev->cacheHits);
+       buf += sprintf(buf, "nDeletedFiles...... %u\n", dev->nDeletedFiles);
+       buf += sprintf(buf, "nUnlinkedFiles..... %u\n", dev->nUnlinkedFiles);
+       buf += sprintf(buf, "refreshCount....... %u\n", dev->refreshCount);
        buf +=
-           sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
-
-       return buf;
-}
-
-
-static char *yaffs_dump_dev_part1(char *buf, yaffs_Device * dev)
-{
-       buf += sprintf(buf, "useNANDECC......... %d\n", dev->param.useNANDECC);
-       buf += sprintf(buf, "noTagsECC.......... %d\n", dev->param.noTagsECC);
-       buf += sprintf(buf, "isYaffs2........... %d\n", dev->param.isYaffs2);
-       buf += sprintf(buf, "inbandTags......... %d\n", dev->param.inbandTags);
-       buf += sprintf(buf, "emptyLostAndFound.. %d\n", dev->param.emptyLostAndFound);
-       buf += sprintf(buf, "disableLazyLoad.... %d\n", dev->param.disableLazyLoad);
+           sprintf(buf, "nBackgroudDeletions %u\n", dev->nBackgroundDeletions);
 
        return buf;
 }
@@ -2588,8 +2955,7 @@ static int yaffs_proc_read(char *page,
        else {
                step-=2;
                
-               /* hold lock_kernel while traversing yaffs_dev_list */
-               lock_kernel();
+               down(&yaffs_context_lock);
 
                /* Locate and print the Nth entry.  Order N-squared but N is small. */
                ylist_for_each(item, &yaffs_context_list) {
@@ -2608,12 +2974,47 @@ static int yaffs_proc_read(char *page,
                        
                        break;
                }
-               unlock_kernel();
+               up(&yaffs_context_lock);
        }
 
        return buf - page < count ? buf - page : count;
 }
 
+static int yaffs_debug_proc_read(char *page,
+                               char **start,
+                               off_t offset, int count, int *eof, void *data)
+{
+       struct ylist_head *item;
+       char *buf = page;
+       int n = 0;
+
+       down(&yaffs_context_lock);
+
+       /* Locate and print the Nth entry.  Order N-squared but N is small. */
+       ylist_for_each(item, &yaffs_context_list) {
+               struct yaffs_LinuxContext *dc = ylist_entry(item, struct yaffs_LinuxContext, contextList);
+               yaffs_Device *dev = dc->dev;
+
+               int erasedChunks;
+               int nObjects;
+               int nTnodes;
+
+               erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock;
+               nObjects = dev->nObjectsCreated -dev->nFreeObjects;
+               nTnodes = dev->nTnodesCreated - dev->nFreeTnodes;
+               
+               
+               buf += sprintf(buf,"%d, %d, %d, %u, %u, %d, %d\n",
+                               n, dev->nFreeChunks, erasedChunks,
+                               dev->backgroundGCs, dev->oldestDirtyGCs,
+                               nObjects, nTnodes);
+       }
+       up(&yaffs_context_lock);
+
+
+       return buf - page < count ? buf - page : count;
+}
+
 /**
  * Set the verbosity of the warnings and error messages.
  *
@@ -2643,6 +3044,8 @@ static struct {
        {"tracing", YAFFS_TRACE_TRACING},
        {"sync", YAFFS_TRACE_SYNC},
 
+       {"background", YAFFS_TRACE_BACKGROUND},
+
        {"verify", YAFFS_TRACE_VERIFY},
        {"verify_nand", YAFFS_TRACE_VERIFY_NAND},
        {"verify_full", YAFFS_TRACE_VERIFY_FULL},
@@ -2774,7 +3177,9 @@ static int __init init_yaffs_fs(void)
        T(YAFFS_TRACE_ALWAYS,
          ("yaffs " __DATE__ " " __TIME__ " Installing. \n"));
 
-       /* Install the proc_fs entry */
+       init_MUTEX(&yaffs_context_lock);
+
+       /* Install the proc_fs entries */
        my_proc_entry = create_proc_entry("yaffs",
                                               S_IRUGO | S_IFREG,
                                               YPROC_ROOT);
@@ -2786,6 +3191,17 @@ static int __init init_yaffs_fs(void)
        } else
                return -ENOMEM;
 
+       debug_proc_entry = create_proc_entry("yaffs_debug",
+                                              S_IRUGO | S_IFREG,
+                                              YPROC_ROOT);
+
+       if (debug_proc_entry) {
+               debug_proc_entry->write_proc = NULL;
+               debug_proc_entry->read_proc = yaffs_debug_proc_read;
+               debug_proc_entry->data = NULL;
+       } else
+               return -ENOMEM;
+
        /* Now add the file system entries */
 
        fsinst = fs_to_install;
@@ -2822,6 +3238,7 @@ static void __exit exit_yaffs_fs(void)
                               " removing. \n"));
 
        remove_proc_entry("yaffs", YPROC_ROOT);
+       remove_proc_entry("yaffs_debug", YPROC_ROOT);
 
        fsinst = fs_to_install;