yaffs Moving timothy_tests and updating the makefiles to work with the new test-framework
[yaffs2.git] / yaffs_vfs_multi.c
index 9e4e31a..3cf6dde 100644 (file)
@@ -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>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))
 #define YAFFS_COMPILE_BACKGROUND
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6, 23))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23))
 #define YAFFS_COMPILE_FREEZER
 #endif
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28))
 #define YAFFS_COMPILE_EXPORTFS
 #endif
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35))
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
 #define YAFFS_USE_SETATTR_COPY
 #define YAFFS_USE_TRUNCATE_SETSIZE
 #endif
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35))
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
 #define YAFFS_HAS_EVICT_INODE
 #endif
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13))
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
 #define YAFFS_NEW_FOLLOW_LINK 1
 #else
 #define YAFFS_NEW_FOLLOW_LINK 0
@@ -72,7 +72,9 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/proc_fs.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39))
 #include <linux/smp_lock.h>
+#endif
 #include <linux/pagemap.h>
 #include <linux/mtd/mtd.h>
 #include <linux/interrupt.h>
 #define YPROC_ROOT  NULL
 #endif
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26))
 #define Y_INIT_TIMER(a)        init_timer(a)
 #else
 #define Y_INIT_TIMER(a)        init_timer_on_stack(a)
 #define YAFFS_USE_WRITE_BEGIN_END 0
 #endif
 
+
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0))
+#define set_nlink(inode, count)  do { (inode)->i_nlink = (count); } while(0)
+#endif
+
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28))
 static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
 {
@@ -168,15 +176,13 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
 #include "yaffs_linux.h"
 
 #include "yaffs_mtdif.h"
-#include "yaffs_mtdif1.h"
-#include "yaffs_mtdif2.h"
 
 unsigned int yaffs_trace_mask = 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;
 unsigned int yaffs_bg_enable = 1;
-
+unsigned int yaffs_auto_select = 1;
 /* Module Parameters */
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
 module_param(yaffs_trace_mask, uint, 0644);
@@ -210,7 +216,8 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
 #define yaffs_inode_to_obj_lv(iptr) ((iptr)->u.generic_ip)
 #endif
 
-#define yaffs_inode_to_obj(iptr) ((struct yaffs_obj *)(yaffs_inode_to_obj_lv(iptr)))
+#define yaffs_inode_to_obj(iptr) \
+       ((struct yaffs_obj *)(yaffs_inode_to_obj_lv(iptr)))
 #define yaffs_dentry_to_obj(dptr) yaffs_inode_to_obj((dptr)->d_inode)
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
@@ -221,12 +228,12 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
 
 #define update_dir_time(dir) do {\
                        (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \
-               } while(0)
+               } while (0)
 
 static void yaffs_put_super(struct super_block *sb);
 
 static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
-                               loff_t * pos);
+                               loff_t *pos);
 static ssize_t yaffs_hold_space(struct file *f);
 static void yaffs_release_space(struct file *f);
 
@@ -236,7 +243,9 @@ static int yaffs_file_flush(struct file *file, fl_owner_t id);
 static int yaffs_file_flush(struct file *file);
 #endif
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync);
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
 static int yaffs_sync_object(struct file *file, int datasync);
 #else
 static int yaffs_sync_object(struct file *file, struct dentry *dentry,
@@ -306,14 +315,12 @@ static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
 static int yaffs_writepage(struct page *page);
 #endif
 
-#ifdef CONFIG_YAFFS_XATTR
-int yaffs_setxattr(struct dentry *dentry, const char *name,
+static int yaffs_setxattr(struct dentry *dentry, const char *name,
                   const void *value, size_t size, int flags);
-ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, void *buff,
-                      size_t size);
-int yaffs_removexattr(struct dentry *dentry, const char *name);
-ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size);
-#endif
+static ssize_t yaffs_getxattr(struct dentry *dentry, const char *name,
+                               void *buff, size_t size);
+static int yaffs_removexattr(struct dentry *dentry, const char *name);
+static ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size);
 
 #if (YAFFS_USE_WRITE_BEGIN_END != 0)
 static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
@@ -341,8 +348,6 @@ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
 
 static void yaffs_touch_super(struct yaffs_dev *dev);
 
-static loff_t yaffs_dir_llseek(struct file *file, loff_t offset, int origin);
-
 static int yaffs_vfs_setattr(struct inode *, struct iattr *);
 
 static struct address_space_operations yaffs_file_address_operations = {
@@ -398,7 +403,7 @@ static const struct file_operations yaffs_file_operations = {
 };
 #endif
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
 static void zero_user_segment(struct page *page, unsigned start, unsigned end)
 {
        void *kaddr = kmap_atomic(page, KM_USER0);
@@ -410,12 +415,10 @@ static void zero_user_segment(struct page *page, unsigned start, unsigned end)
 
 static const struct inode_operations yaffs_file_inode_operations = {
        .setattr = yaffs_setattr,
-#ifdef CONFIG_YAFFS_XATTR
        .setxattr = yaffs_setxattr,
        .getxattr = yaffs_getxattr,
        .listxattr = yaffs_listxattr,
        .removexattr = yaffs_removexattr,
-#endif
 };
 
 static const struct inode_operations yaffs_symlink_inode_operations = {
@@ -425,12 +428,10 @@ static const struct inode_operations yaffs_symlink_inode_operations = {
        .put_link = yaffs_put_link,
 #endif
        .setattr = yaffs_setattr,
-#ifdef CONFIG_YAFFS_XATTR
        .setxattr = yaffs_setxattr,
        .getxattr = yaffs_getxattr,
        .listxattr = yaffs_listxattr,
        .removexattr = yaffs_removexattr,
-#endif
 };
 
 static const struct inode_operations yaffs_dir_inode_operations = {
@@ -444,19 +445,17 @@ static const struct inode_operations yaffs_dir_inode_operations = {
        .mknod = yaffs_mknod,
        .rename = yaffs_rename,
        .setattr = yaffs_setattr,
-#ifdef CONFIG_YAFFS_XATTR
        .setxattr = yaffs_setxattr,
        .getxattr = yaffs_getxattr,
        .listxattr = yaffs_listxattr,
        .removexattr = yaffs_removexattr,
-#endif
 };
 
 static const struct file_operations yaffs_dir_operations = {
        .read = generic_read_dir,
        .readdir = yaffs_readdir,
        .fsync = yaffs_sync_object,
-       .llseek = yaffs_dir_llseek,
+       .llseek = generic_file_llseek,
 };
 
 static const struct super_operations yaffs_super_ops = {
@@ -481,7 +480,7 @@ static const struct super_operations yaffs_super_ops = {
 
 static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr)
 {
-#ifdef  YAFFS_USE_SETATTR_COPY
+#ifdef YAFFS_USE_SETATTR_COPY
        setattr_copy(inode, attr);
        return 0;
 #else
@@ -492,7 +491,7 @@ static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr)
 
 static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
 {
-#ifdef  YAFFS_USE_TRUNCATE_SETSIZE
+#ifdef YAFFS_USE_TRUNCATE_SETSIZE
        truncate_setsize(inode, newsize);
        return 0;
 #else
@@ -509,14 +508,14 @@ static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev)
 
 static void yaffs_gross_lock(struct yaffs_dev *dev)
 {
-       T(YAFFS_TRACE_LOCK, (TSTR("yaffs locking %p\n"), current));
+       yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locking %p", current);
        mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock));
-       T(YAFFS_TRACE_LOCK, (TSTR("yaffs locked %p\n"), current));
+       yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locked %p", current);
 }
 
 static void yaffs_gross_unlock(struct yaffs_dev *dev)
 {
-       T(YAFFS_TRACE_LOCK, (TSTR("yaffs unlocking %p\n"), current));
+       yaffs_trace(YAFFS_TRACE_LOCK, "yaffs unlocking %p", current);
        mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock));
 }
 
@@ -625,7 +624,7 @@ static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir)
 {
        struct yaffs_dev *dev = dir->my_dev;
        struct yaffs_search_context *sc =
-           YMALLOC(sizeof(struct yaffs_search_context));
+           kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS);
        if (sc) {
                sc->dir_obj = dir;
                sc->dev = dev;
@@ -648,7 +647,7 @@ static void yaffs_search_end(struct yaffs_search_context *sc)
 {
        if (sc) {
                list_del(&sc->others);
-               YFREE(sc);
+               kfree(sc);
        }
 }
 
@@ -694,11 +693,9 @@ static void yaffs_remove_obj_callback(struct yaffs_obj *obj)
         * the search context to the next object to prevent a hanging pointer.
         */
        list_for_each(i, search_contexts) {
-               if (i) {
-                       sc = list_entry(i, struct yaffs_search_context, others);
-                       if (sc->next_return == obj)
-                               yaffs_search_advance(sc);
-               }
+               sc = list_entry(i, struct yaffs_search_context, others);
+               if (sc->next_return == obj)
+                       yaffs_search_advance(sc);
        }
 
 }
@@ -795,9 +792,8 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
        if (current != yaffs_dev_to_lc(dev)->readdir_process)
                yaffs_gross_lock(dev);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_lookup for %d:%s\n"),
-          yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup for %d:%s",
+               yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name);
 
        obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name);
 
@@ -808,26 +804,12 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
                yaffs_gross_unlock(dev);
 
        if (obj) {
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_lookup found %d\n"), obj->obj_id));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_lookup found %d", obj->obj_id);
 
                inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
-
-               if (inode) {
-                       T(YAFFS_TRACE_OS, (TSTR("yaffs_loookup dentry \n")));
-/* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
- * d_add even if NULL inode */
-#if 0
-                       /*dget(dentry); // try to solve directory bug */
-                       d_add(dentry, inode);
-
-                       /* return dentry; */
-                       return NULL;
-#endif
-               }
-
        } else {
-               T(YAFFS_TRACE_OS, (TSTR("yaffs_lookup not found\n")));
+               yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found");
 
        }
 
@@ -845,9 +827,9 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
  */
 static void yaffs_put_inode(struct inode *inode)
 {
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_put_inode: ino %d, count %d\n"), (int)inode->i_ino,
-          atomic_read(&inode->i_count)));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_put_inode: ino %d, count %d"),
+               (int)inode->i_ino, atomic_read(&inode->i_count);
 
 }
 #endif
@@ -880,10 +862,10 @@ static void yaffs_evict_inode(struct inode *inode)
 
        obj = yaffs_inode_to_obj(inode);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_evict_inode: ino %d, count %d %s\n"), (int)inode->i_ino,
-          atomic_read(&inode->i_count),
-          obj ? "object exists" : "null object"));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_evict_inode: ino %d, count %d %s",
+               (int)inode->i_ino, atomic_read(&inode->i_count),
+               obj ? "object exists" : "null object");
 
        if (!inode->i_nlink && !is_bad_inode(inode))
                deleteme = 1;
@@ -902,7 +884,6 @@ static void yaffs_evict_inode(struct inode *inode)
                yaffs_unstitch_obj(inode, obj);
                yaffs_gross_unlock(dev);
        }
-
 }
 #else
 
@@ -920,10 +901,10 @@ static void yaffs_clear_inode(struct inode *inode)
 
        obj = yaffs_inode_to_obj(inode);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_clear_inode: ino %d, count %d %s\n"), (int)inode->i_ino,
-          atomic_read(&inode->i_count),
-          obj ? "object exists" : "null object"));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_clear_inode: ino %d, count %d %s",
+               (int)inode->i_ino, atomic_read(&inode->i_count),
+               obj ? "object exists" : "null object");
 
        if (obj) {
                dev = obj->my_dev;
@@ -944,10 +925,10 @@ static void yaffs_delete_inode(struct inode *inode)
        struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
        struct yaffs_dev *dev;
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_delete_inode: ino %d, count %d %s\n"), (int)inode->i_ino,
-          atomic_read(&inode->i_count),
-          obj ? "object exists" : "null object"));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_delete_inode: ino %d, count %d %s",
+               (int)inode->i_ino, atomic_read(&inode->i_count),
+               obj ? "object exists" : "null object");
 
        if (obj) {
                dev = obj->my_dev;
@@ -972,9 +953,10 @@ static int yaffs_file_flush(struct file *file)
 
        struct yaffs_dev *dev = obj->my_dev;
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_file_flush object %d (%s)\n"), obj->obj_id,
-          obj->dirty ? "dirty" : "clean"));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_file_flush object %d (%s)",
+               obj->obj_id,
+               obj->dirty ? "dirty" : "clean");
 
        yaffs_gross_lock(dev);
 
@@ -992,13 +974,13 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg)
        struct yaffs_obj *obj;
        unsigned char *pg_buf;
        int ret;
-
+       loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT;
        struct yaffs_dev *dev;
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_readpage_nolock at %08x, size %08x\n"),
-          (unsigned)(pg->index << PAGE_CACHE_SHIFT),
-          (unsigned)PAGE_CACHE_SIZE));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_readpage_nolock at %lld, size %08x",
+               (long long)pos,
+               (unsigned)PAGE_CACHE_SIZE);
 
        obj = yaffs_dentry_to_obj(f->f_dentry);
 
@@ -1016,8 +998,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg)
 
        yaffs_gross_lock(dev);
 
-       ret = yaffs_file_rd(obj, pg_buf,
-                           pg->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE);
+       ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE);
 
        yaffs_gross_unlock(dev);
 
@@ -1035,7 +1016,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg)
        flush_dcache_page(pg);
        kunmap(pg);
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage_nolock done\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done");
        return ret;
 }
 
@@ -1050,9 +1031,9 @@ static int yaffs_readpage(struct file *f, struct page *pg)
 {
        int ret;
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage");
        ret = yaffs_readpage_unlock(f, pg);
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage done\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done");
        return ret;
 }
 
@@ -1089,13 +1070,12 @@ static int yaffs_writepage(struct page *page)
                n_bytes = i_size & (PAGE_CACHE_SIZE - 1);
 
                if (page->index > end_index || !n_bytes) {
-                       T(YAFFS_TRACE_OS,
-                         (TSTR
-                          ("yaffs_writepage at %08x, inode size = %08x!!!\n"),
-                          (unsigned)(page->index << PAGE_CACHE_SHIFT),
-                          (unsigned)inode->i_size));
-                       T(YAFFS_TRACE_OS,
-                         (TSTR("                -> don't care!!\n")));
+                       yaffs_trace(YAFFS_TRACE_OS,
+                               "yaffs_writepage at %lld, inode size = %lld!!",
+                               ((loff_t)page->index) << PAGE_CACHE_SHIFT,
+                               inode->i_size);
+                       yaffs_trace(YAFFS_TRACE_OS,
+                               "                -> don't care!!");
 
                        zero_user_segment(page, 0, PAGE_CACHE_SIZE);
                        set_page_writeback(page);
@@ -1116,21 +1096,21 @@ static int yaffs_writepage(struct page *page)
        dev = obj->my_dev;
        yaffs_gross_lock(dev);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_writepage at %08x, size %08x\n"),
-          (unsigned)(page->index << PAGE_CACHE_SHIFT), n_bytes));
-       T(YAFFS_TRACE_OS,
-         (TSTR("writepag0: obj = %05x, ino = %05x\n"),
-          (int)obj->variant.file_variant.file_size, (int)inode->i_size));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_writepage at %lld, size %08x",
+               ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes);
+       yaffs_trace(YAFFS_TRACE_OS,
+               "writepag0: obj = %lld, ino = %lld",
+               obj->variant.file_variant.file_size, inode->i_size);
 
        n_written = yaffs_wr_file(obj, buffer,
-                                 page->index << PAGE_CACHE_SHIFT, n_bytes, 0);
+                                 ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0);
 
        yaffs_touch_super(dev);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("writepag1: obj = %05x, ino = %05x\n"),
-          (int)obj->variant.file_variant.file_size, (int)inode->i_size));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "writepag1: obj = %lld, ino = %lld",
+               obj->variant.file_variant.file_size, inode->i_size);
 
        yaffs_gross_unlock(dev);
 
@@ -1166,9 +1146,9 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
                ret = -ENOMEM;
                goto out;
        }
-       T(YAFFS_TRACE_OS,
-         (TSTR("start yaffs_write_begin index %d(%x) uptodate %d\n"),
-          (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "start yaffs_write_begin index %d(%x) uptodate %d",
+               (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0);
 
        /* Get fs space */
        space_held = yaffs_hold_space(filp);
@@ -1187,13 +1167,13 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
                goto out;
 
        /* Happy path return */
-       T(YAFFS_TRACE_OS, (TSTR("end yaffs_write_begin - ok\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok");
 
        return 0;
 
 out:
-       T(YAFFS_TRACE_OS,
-         (TSTR("end yaffs_write_begin fail returning %d\n"), ret));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "end yaffs_write_begin fail returning %d", ret);
        if (space_held)
                yaffs_release_space(filp);
        if (pg) {
@@ -1208,7 +1188,7 @@ out:
 static int yaffs_prepare_write(struct file *f, struct page *pg,
                               unsigned offset, unsigned to)
 {
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_prepair_write\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write");
 
        if (!Page_Uptodate(pg))
                return yaffs_readpage_nolock(f, pg);
@@ -1228,19 +1208,17 @@ static int yaffs_write_end(struct file *filp, struct address_space *mapping,
        kva = kmap(pg);
        addr = kva + offset_into_page;
 
-       T(YAFFS_TRACE_OS,
-         ("yaffs_write_end addr %p pos %x n_bytes %d\n",
-          addr, (unsigned)pos, copied));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_write_end addr %p pos %lld n_bytes %d",
+               addr, pos, copied);
 
        ret = yaffs_file_write(filp, addr, copied, &pos);
 
        if (ret != copied) {
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_write_end not same size ret %d  copied %d\n"),
-                  ret, copied));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_write_end not same size ret %d  copied %d",
+                       ret, copied);
                SetPageError(pg);
-       } else {
-               /* Nothing */
        }
 
        kunmap(pg);
@@ -1261,35 +1239,26 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
        int n_bytes = to - offset;
        int n_written;
 
-       unsigned spos = pos;
-       unsigned saddr;
-
        kva = kmap(pg);
        addr = kva + offset;
 
-       saddr = (unsigned)addr;
-
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_commit_write addr %x pos %x n_bytes %d\n"),
-          saddr, spos, n_bytes));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_commit_write addr %p pos %lld n_bytes %d",
+               addr, pos, n_bytes);
 
        n_written = yaffs_file_write(f, addr, n_bytes, &pos);
 
        if (n_written != n_bytes) {
-               T(YAFFS_TRACE_OS,
-                 (TSTR
-                  ("yaffs_commit_write not same size n_written %d  n_bytes %d\n"),
-                  n_written, n_bytes));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_commit_write not same size n_written %d  n_bytes %d",
+                       n_written, n_bytes);
                SetPageError(pg);
-       } else {
-               /* Nothing */
        }
-
        kunmap(pg);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_commit_write returning %d\n"),
-          n_written == n_bytes ? 0 : n_written));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_commit_write returning %d",
+               n_written == n_bytes ? 0 : n_written);
 
        return n_written == n_bytes ? 0 : n_written;
 }
@@ -1359,13 +1328,12 @@ static void yaffs_fill_inode_from_obj(struct inode *inode,
                inode->i_size = yaffs_get_obj_length(obj);
                inode->i_blocks = (inode->i_size + 511) >> 9;
 
-               inode->i_nlink = yaffs_get_obj_link_count(obj);
+               set_nlink(inode, yaffs_get_obj_link_count(obj));
 
-               T(YAFFS_TRACE_OS,
-                 (TSTR
-                  ("yaffs_fill_inode mode %x uid %d gid %d size %d count %d\n"),
-                  inode->i_mode, inode->i_uid, inode->i_gid,
-                  (int)inode->i_size, atomic_read(&inode->i_count)));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_fill_inode mode %x uid %d gid %d size %lld count %d",
+                       inode->i_mode, inode->i_uid, inode->i_gid,
+                       inode->i_size, atomic_read(&inode->i_count));
 
                switch (obj->yst_mode & S_IFMT) {
                default:        /* fifo, device or socket */
@@ -1397,8 +1365,8 @@ static void yaffs_fill_inode_from_obj(struct inode *inode,
                obj->my_inode = inode;
 
        } else {
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_fill_inode invalid parameters\n")));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_fill_inode invalid parameters");
        }
 
 }
@@ -1409,21 +1377,21 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
        struct inode *inode;
 
        if (!sb) {
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_get_inode for NULL super_block!!\n")));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_get_inode for NULL super_block!!");
                return NULL;
 
        }
 
        if (!obj) {
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_get_inode for NULL object!!\n")));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_get_inode for NULL object!!");
                return NULL;
 
        }
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_get_inode for object %d\n"), obj->obj_id));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_get_inode for object %d", obj->obj_id);
 
        inode = Y_IGET(sb, obj->obj_id);
        if (IS_ERR(inode))
@@ -1440,12 +1408,19 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
                                loff_t * pos)
 {
        struct yaffs_obj *obj;
-       int n_written, ipos;
+       int n_written;
+       loff_t ipos;
        struct inode *inode;
        struct yaffs_dev *dev;
 
        obj = yaffs_dentry_to_obj(f->f_dentry);
 
+       if (!obj) {
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_file_write: hey obj is null!");
+                return -EINVAL;
+        }
+
        dev = obj->my_dev;
 
        yaffs_gross_lock(dev);
@@ -1457,22 +1432,17 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
        else
                ipos = *pos;
 
-       if (!obj)
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_file_write: hey obj is null!\n")));
-       else
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_file_write about to write writing %u(%x) bytes"
-                       "to object %d at %d(%x)\n"),
-                  (unsigned)n, (unsigned)n, obj->obj_id, ipos, ipos));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_file_write about to write writing %u(%x) bytes to object %d at %lld",
+               (unsigned)n, (unsigned)n, obj->obj_id, ipos);
 
        n_written = yaffs_wr_file(obj, buf, ipos, n, 0);
 
        yaffs_touch_super(dev);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_file_write: %d(%x) bytes written\n"),
-          (unsigned)n, (unsigned)n));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_file_write: %d(%x) bytes written",
+               (unsigned)n, (unsigned)n);
 
        if (n_written > 0) {
                ipos += n_written;
@@ -1481,9 +1451,9 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
                        inode->i_size = ipos;
                        inode->i_blocks = (ipos + 511) >> 9;
 
-                       T(YAFFS_TRACE_OS,
-                         (TSTR("yaffs_file_write size updated to %d bytes, "
-                               "%d blocks\n"), ipos, (int)(inode->i_blocks)));
+                       yaffs_trace(YAFFS_TRACE_OS,
+                               "yaffs_file_write size updated to %lld bytes, %d blocks",
+                               ipos, (int)(inode->i_blocks));
                }
 
        }
@@ -1529,31 +1499,6 @@ static void yaffs_release_space(struct file *f)
        yaffs_gross_unlock(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)
 {
        struct yaffs_obj *obj;
@@ -1581,13 +1526,13 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
                goto out;
        }
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_readdir: starting at %d\n"), (int)offset));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_readdir: starting at %d", (int)offset);
 
        if (offset == 0) {
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_readdir: entry . ino %d \n"),
-                  (int)inode->i_ino));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_readdir: entry . ino %d",
+                       (int)inode->i_ino);
                yaffs_gross_unlock(dev);
                if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0) {
                        yaffs_gross_lock(dev);
@@ -1598,9 +1543,9 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
                f->f_pos++;
        }
        if (offset == 1) {
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_readdir: entry .. ino %d \n"),
-                  (int)f->f_dentry->d_parent->d_inode->i_ino));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_readdir: entry .. ino %d",
+                       (int)f->f_dentry->d_parent->d_inode->i_ino);
                yaffs_gross_unlock(dev);
                if (filldir(dirent, "..", 2, offset,
                            f->f_dentry->d_parent->d_inode->i_ino,
@@ -1631,9 +1576,9 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
                        int this_type = yaffs_get_obj_type(l);
 
                        yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
-                       T(YAFFS_TRACE_OS,
-                         (TSTR("yaffs_readdir: %s inode %d\n"),
-                          name, yaffs_get_obj_inode(l)));
+                       yaffs_trace(YAFFS_TRACE_OS,
+                               "yaffs_readdir: %s inode %d",
+                               name, yaffs_get_obj_inode(l));
 
                        yaffs_gross_unlock(dev);
 
@@ -1695,18 +1640,18 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
                mode |= S_ISGID;
 
        if (parent) {
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_mknod: parent object %d type %d\n"),
-                  parent->obj_id, parent->variant_type));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_mknod: parent object %d type %d",
+                       parent->obj_id, parent->variant_type);
        } else {
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_mknod: could not get parent object\n")));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_mknod: could not get parent object");
                return -EPERM;
        }
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making oject for %s, "
-                               "mode %x dev %x\n"),
-                          dentry->d_name.name, mode, rdev));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_mknod: making oject for %s, mode %x dev %x",
+               dentry->d_name.name, mode, rdev);
 
        dev = parent->my_dev;
 
@@ -1715,7 +1660,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
        switch (mode & S_IFMT) {
        default:
                /* Special (socket, fifo, device...) */
-               T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making special\n")));
+               yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making special");
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
                obj =
                    yaffs_create_special(parent, dentry->d_name.name, mode, uid,
@@ -1727,17 +1672,17 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
 #endif
                break;
        case S_IFREG:           /* file          */
-               T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making file\n")));
+               yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making file");
                obj = yaffs_create_file(parent, dentry->d_name.name, mode, uid,
                                        gid);
                break;
        case S_IFDIR:           /* directory */
-               T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making directory\n")));
+               yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making directory");
                obj = yaffs_create_dir(parent, dentry->d_name.name, mode,
                                       uid, gid);
                break;
        case S_IFLNK:           /* symlink */
-               T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making symlink\n")));
+               yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making symlink");
                obj = NULL;     /* Do we ever get here? */
                break;
        }
@@ -1749,13 +1694,13 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
                inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
                d_instantiate(dentry, inode);
                update_dir_time(dir);
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_mknod created object %d count = %d\n"),
-                  obj->obj_id, atomic_read(&inode->i_count)));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_mknod created object %d count = %d",
+                       obj->obj_id, atomic_read(&inode->i_count));
                error = 0;
                yaffs_fill_inode_from_obj(dir, parent);
        } else {
-               T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod failed making object\n")));
+               yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod failed making object");
                error = -ENOMEM;
        }
 
@@ -1765,7 +1710,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
 static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
        int ret_val;
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_mkdir\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_mkdir");
        ret_val = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
        return ret_val;
 }
@@ -1777,7 +1722,7 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
 static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
 #endif
 {
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_create\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_create");
        return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
 }
 
@@ -1788,9 +1733,8 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
        struct yaffs_dev *dev;
        struct yaffs_obj *obj;
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_unlink %d:%s\n"),
-          (int)(dir->i_ino), dentry->d_name.name));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_unlink %d:%s",
+               (int)(dir->i_ino), dentry->d_name.name);
        obj = yaffs_inode_to_obj(dir);
        dev = obj->my_dev;
 
@@ -1799,10 +1743,9 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
        ret_val = yaffs_unlinker(obj, dentry->d_name.name);
 
        if (ret_val == YAFFS_OK) {
-               dentry->d_inode->i_nlink--;
+               inode_dec_link_count(dentry->d_inode);
                dir->i_version++;
                yaffs_gross_unlock(dev);
-               mark_inode_dirty(dentry->d_inode);
                update_dir_time(dir);
                return 0;
        }
@@ -1821,7 +1764,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
        struct yaffs_obj *link = NULL;
        struct yaffs_dev *dev;
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_link\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_link");
 
        obj = yaffs_inode_to_obj(inode);
        dev = obj->my_dev;
@@ -1834,13 +1777,13 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
                                   obj);
 
        if (link) {
-               old_dentry->d_inode->i_nlink = yaffs_get_obj_link_count(obj);
+               set_nlink(old_dentry->d_inode, yaffs_get_obj_link_count(obj));
                d_instantiate(dentry, old_dentry->d_inode);
                atomic_inc(&old_dentry->d_inode->i_count);
-               T(YAFFS_TRACE_OS,
-                 (TSTR("yaffs_link link count %d i_count %d\n"),
-                  old_dentry->d_inode->i_nlink,
-                  atomic_read(&old_dentry->d_inode->i_count)));
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_link link count %d i_count %d",
+                       old_dentry->d_inode->i_nlink,
+                       atomic_read(&old_dentry->d_inode->i_count));
        }
 
        yaffs_gross_unlock(dev);
@@ -1862,7 +1805,15 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
        gid_t gid =
            (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_symlink\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink");
+
+       if (strnlen(dentry->d_name.name, YAFFS_MAX_NAME_LENGTH + 1) >
+                               YAFFS_MAX_NAME_LENGTH)
+               return -ENAMETOOLONG;
+
+       if (strnlen(symname, YAFFS_MAX_ALIAS_LENGTH + 1) >
+                               YAFFS_MAX_ALIAS_LENGTH)
+               return -ENAMETOOLONG;
 
        dev = yaffs_inode_to_obj(dir)->my_dev;
        yaffs_gross_lock(dev);
@@ -1876,16 +1827,18 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
                inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
                d_instantiate(dentry, inode);
                update_dir_time(dir);
-               T(YAFFS_TRACE_OS, (TSTR("symlink created OK\n")));
+               yaffs_trace(YAFFS_TRACE_OS, "symlink created OK");
                return 0;
        } else {
-               T(YAFFS_TRACE_OS, (TSTR("symlink not created\n")));
+               yaffs_trace(YAFFS_TRACE_OS, "symlink not created");
        }
 
        return -ENOMEM;
 }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
 static int yaffs_sync_object(struct file *file, int datasync)
 #else
 static int yaffs_sync_object(struct file *file, struct dentry *dentry,
@@ -1903,7 +1856,8 @@ static int yaffs_sync_object(struct file *file, struct dentry *dentry,
 
        dev = obj->my_dev;
 
-       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, (TSTR("yaffs_sync_object\n")));
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
+               "yaffs_sync_object");
        yaffs_gross_lock(dev);
        yaffs_flush_file(obj, 1, datasync);
        yaffs_gross_unlock(dev);
@@ -1922,7 +1876,7 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
        int ret_val = YAFFS_FAIL;
        struct yaffs_obj *target;
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_rename\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_rename");
        dev = yaffs_inode_to_obj(old_dir)->my_dev;
 
        yaffs_gross_lock(dev);
@@ -1934,12 +1888,12 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
        if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
            !list_empty(&target->variant.dir_variant.children)) {
 
-               T(YAFFS_TRACE_OS, (TSTR("target is non-empty dir\n")));
+               yaffs_trace(YAFFS_TRACE_OS, "target is non-empty dir");
 
                ret_val = YAFFS_FAIL;
        } else {
                /* Now does unlinking internally using shadowing mechanism */
-               T(YAFFS_TRACE_OS, (TSTR("calling yaffs_rename_obj\n")));
+               yaffs_trace(YAFFS_TRACE_OS, "calling yaffs_rename_obj");
 
                ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir),
                                           old_dentry->d_name.name,
@@ -1949,10 +1903,8 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
        yaffs_gross_unlock(dev);
 
        if (ret_val == YAFFS_OK) {
-               if (target) {
-                       new_dentry->d_inode->i_nlink--;
-                       mark_inode_dirty(new_dentry->d_inode);
-               }
+               if (target)
+                       inode_dec_link_count(new_dentry->d_inode);
 
                update_dir_time(old_dir);
                if (old_dir != new_dir)
@@ -1969,13 +1921,14 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
        int error = 0;
        struct yaffs_dev *dev;
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_setattr of object %d\n"),
-          yaffs_inode_to_obj(inode)->obj_id));
-
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_setattr of object %d",
+               yaffs_inode_to_obj(inode)->obj_id);
+#if 0
        /* Fail if a requested resize >= 2GB */
        if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31))
                error = -EINVAL;
+#endif
 
        if (error == 0)
                error = inode_change_ok(inode, attr);
@@ -1983,7 +1936,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
                int result;
                if (!error) {
                        error = yaffs_vfs_setattr(inode, attr);
-                       T(YAFFS_TRACE_OS, (TSTR("inode_setattr called\n")));
+                       yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called");
                        if (attr->ia_valid & ATTR_SIZE) {
                                yaffs_vfs_setsize(inode, attr->ia_size);
                                inode->i_blocks = (inode->i_size + 511) >> 9;
@@ -1991,9 +1944,10 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
                }
                dev = yaffs_inode_to_obj(inode)->my_dev;
                if (attr->ia_valid & ATTR_SIZE) {
-                       T(YAFFS_TRACE_OS, (TSTR("resize to %d(%x)\n"),
-                                          (int)(attr->ia_size),
-                                          (int)(attr->ia_size)));
+                       yaffs_trace(YAFFS_TRACE_OS,
+                               "resize to %d(%x)",
+                               (int)(attr->ia_size),
+                               (int)(attr->ia_size));
                }
                yaffs_gross_lock(dev);
                result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr);
@@ -2006,13 +1960,12 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
 
        }
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_setattr done returning %d\n"), error));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error);
 
        return error;
 }
 
-#ifdef CONFIG_YAFFS_XATTR
-int yaffs_setxattr(struct dentry *dentry, const char *name,
+static int yaffs_setxattr(struct dentry *dentry, const char *name,
                   const void *value, size_t size, int flags)
 {
        struct inode *inode = dentry->d_inode;
@@ -2020,7 +1973,7 @@ int yaffs_setxattr(struct dentry *dentry, const char *name,
        struct yaffs_dev *dev;
        struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_setxattr of object %d\n"), obj->obj_id));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id);
 
        if (error == 0) {
                int result;
@@ -2034,21 +1987,22 @@ int yaffs_setxattr(struct dentry *dentry, const char *name,
                yaffs_gross_unlock(dev);
 
        }
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_setxattr done returning %d\n"), error));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error);
 
        return error;
 }
 
-ssize_t yaffs_getxattr(struct dentry * dentry, const char *name, void *buff,
-                      size_t size)
+static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name,
+                       void *buff, size_t size)
 {
        struct inode *inode = dentry->d_inode;
        int error = 0;
        struct yaffs_dev *dev;
        struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_getxattr \"%s\" from object %d\n"), name, obj->obj_id));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_getxattr \"%s\" from object %d",
+               name, obj->obj_id);
 
        if (error == 0) {
                dev = obj->my_dev;
@@ -2057,20 +2011,20 @@ ssize_t yaffs_getxattr(struct dentry * dentry, const char *name, void *buff,
                yaffs_gross_unlock(dev);
 
        }
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_getxattr done returning %d\n"), error));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error);
 
        return error;
 }
 
-int yaffs_removexattr(struct dentry *dentry, const char *name)
+static int yaffs_removexattr(struct dentry *dentry, const char *name)
 {
        struct inode *inode = dentry->d_inode;
        int error = 0;
        struct yaffs_dev *dev;
        struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_removexattr of object %d\n"), obj->obj_id));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_removexattr of object %d", obj->obj_id);
 
        if (error == 0) {
                int result;
@@ -2084,21 +2038,21 @@ int yaffs_removexattr(struct dentry *dentry, const char *name)
                yaffs_gross_unlock(dev);
 
        }
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_removexattr done returning %d\n"), error));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_removexattr done returning %d", error);
 
        return error;
 }
 
-ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size)
+static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size)
 {
        struct inode *inode = dentry->d_inode;
        int error = 0;
        struct yaffs_dev *dev;
        struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_listxattr of object %d\n"), obj->obj_id));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_listxattr of object %d", obj->obj_id);
 
        if (error == 0) {
                dev = obj->my_dev;
@@ -2107,12 +2061,12 @@ ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size)
                yaffs_gross_unlock(dev);
 
        }
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_listxattr done returning %d\n"), error));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_listxattr done returning %d", error);
 
        return error;
 }
 
-#endif
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf)
@@ -2129,7 +2083,7 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
        struct yaffs_dev *dev = yaffs_super_to_dev(sb);
 #endif
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_statfs\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_statfs");
 
        yaffs_gross_lock(dev);
 
@@ -2195,8 +2149,9 @@ static void yaffs_flush_inodes(struct super_block *sb)
        list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) {
                obj = yaffs_inode_to_obj(iptr);
                if (obj) {
-                       T(YAFFS_TRACE_OS, (TSTR("flushing obj %d\n"),
-                                          obj->obj_id));
+                       yaffs_trace(YAFFS_TRACE_OS,
+                               "flushing obj %d",
+                               obj->obj_id);
                        yaffs_flush_file(obj, 1, 0);
                }
        }
@@ -2245,12 +2200,12 @@ static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint)
        unsigned gc_urgent = yaffs_bg_gc_urgency(dev);
        int do_checkpoint;
 
-       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
-         (TSTR("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_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
+               "yaffs_do_sync_fs: gc-urgency %d %s %s%s",
+               gc_urgent,
+               sb->s_dirt ? "dirty" : "clean",
+               request_checkpoint ? "checkpoint requested" : "no checkpoint",
+               oneshot_checkpoint ? " one-shot" : "");
 
        yaffs_gross_lock(dev);
        do_checkpoint = ((request_checkpoint && !gc_urgent) ||
@@ -2273,7 +2228,7 @@ static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint)
  * yaffs_bg_start() launches the background thread.
  * yaffs_bg_stop() cleans up the background thread.
  *
- * NB: 
+ * 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.
@@ -2299,14 +2254,14 @@ static int yaffs_bg_thread_fn(void *data)
        int gc_result;
        struct timer_list timer;
 
-       T(YAFFS_TRACE_BACKGROUND,
-         (TSTR("yaffs_background starting for dev %p\n"), (void *)dev));
+       yaffs_trace(YAFFS_TRACE_BACKGROUND,
+               "yaffs_background starting for dev %p", (void *)dev);
 
 #ifdef YAFFS_COMPILE_FREEZER
        set_freezable();
 #endif
        while (context->bg_running) {
-               T(YAFFS_TRACE_BACKGROUND, (TSTR("yaffs_background\n")));
+               yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background");
 
                if (kthread_should_stop())
                        break;
@@ -2334,11 +2289,13 @@ static int yaffs_bg_thread_fn(void *data)
                                        next_gc = now + HZ / 10 + 1;
                                else
                                        next_gc = now + HZ * 2;
-                       } else  /*
+                       } else  {
+                               /*
                                 * gc not running so set to next_dir_update
                                 * to cut down on wake ups
                                 */
                                next_gc = next_dir_update;
+                        }
                }
                yaffs_gross_unlock(dev);
 #if 1
@@ -2422,9 +2379,9 @@ static int yaffs_write_super(struct super_block *sb)
 {
        unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2);
 
-       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
-         (TSTR("yaffs_write_super%s\n"),
-          request_checkpoint ? " checkpt" : ""));
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
+               "yaffs_write_super %s",
+               request_checkpoint ? " checkpt" : "");
 
        yaffs_do_sync_fs(sb, request_checkpoint);
 
@@ -2441,8 +2398,8 @@ static int yaffs_sync_fs(struct super_block *sb)
 {
        unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1);
 
-       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
-         (TSTR("yaffs_sync_fs%s\n"), request_checkpoint ? " checkpt" : ""));
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
+               "yaffs_sync_fs%s", request_checkpoint ? " checkpt" : "");
 
        yaffs_do_sync_fs(sb, request_checkpoint);
 
@@ -2457,7 +2414,7 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
        struct yaffs_obj *obj;
        struct yaffs_dev *dev = yaffs_super_to_dev(sb);
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_iget for %lu\n"), ino));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino);
 
        inode = iget_locked(sb, ino);
        if (!inode)
@@ -2494,8 +2451,8 @@ static void yaffs_read_inode(struct inode *inode)
        struct yaffs_obj *obj;
        struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_read_inode for %d\n"), (int)inode->i_ino));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_read_inode for %d", (int)inode->i_ino);
 
        if (current != yaffs_dev_to_lc(dev)->readdir_process)
                yaffs_gross_lock(dev);
@@ -2516,22 +2473,21 @@ struct mutex yaffs_context_lock;
 static void yaffs_put_super(struct super_block *sb)
 {
        struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+       struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_put_super\n")));
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
+                       "yaffs_put_super");
 
-       T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
-         (TSTR("Shutting down yaffs background thread\n")));
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+               "Shutting down yaffs background thread");
        yaffs_bg_stop(dev);
-       T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
-         (TSTR("yaffs background thread shut down\n")));
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+               "yaffs background thread shut down");
 
        yaffs_gross_lock(dev);
 
        yaffs_flush_super(sb, 1);
 
-       if (yaffs_dev_to_lc(dev)->put_super_fn)
-               yaffs_dev_to_lc(dev)->put_super_fn(sb);
-
        yaffs_deinitialise(dev);
 
        yaffs_gross_unlock(dev);
@@ -2541,28 +2497,28 @@ static void yaffs_put_super(struct super_block *sb)
        mutex_unlock(&yaffs_context_lock);
 
        if (yaffs_dev_to_lc(dev)->spare_buffer) {
-               YFREE(yaffs_dev_to_lc(dev)->spare_buffer);
+               kfree(yaffs_dev_to_lc(dev)->spare_buffer);
                yaffs_dev_to_lc(dev)->spare_buffer = NULL;
        }
 
        kfree(dev);
-}
 
-static void yaffs_mtd_put_super(struct super_block *sb)
-{
-       struct mtd_info *mtd = yaffs_dev_to_mtd(yaffs_super_to_dev(sb));
-
-       if (mtd->sync)
+       if (mtd && mtd->sync)
                mtd->sync(mtd);
 
-       put_mtd_device(mtd);
+       if(mtd)
+               put_mtd_device(mtd);
+
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
+                       "yaffs_put_super done");
 }
 
+
 static void yaffs_touch_super(struct yaffs_dev *dev)
 {
        struct super_block *sb = yaffs_dev_to_lc(dev)->super;
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_touch_super() sb = %p\n"), sb));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_touch_super() sb = %p", sb);
        if (sb)
                sb->s_dirt = 1;
 }
@@ -2578,6 +2534,7 @@ struct yaffs_options {
        int lazy_loading_overridden;
        int empty_lost_and_found;
        int empty_lost_and_found_overridden;
+       int disable_summary;
 };
 
 #define MAX_OPT_LEN 30
@@ -2605,9 +2562,9 @@ static int yaffs_parse_options(struct yaffs_options *options,
                        options_str++;
                }
 
-               if (!strcmp(cur_opt, "inband-tags"))
+               if (!strcmp(cur_opt, "inband-tags")) {
                        options->inband_tags = 1;
-               else if (!strcmp(cur_opt, "tags-ecc-off")) {
+               else if (!strcmp(cur_opt, "tags-ecc-off")) {
                        options->tags_ecc_on = 0;
                        options->tags_ecc_overridden = 1;
                } else if (!strcmp(cur_opt, "tags-ecc-on")) {
@@ -2619,19 +2576,21 @@ static int yaffs_parse_options(struct yaffs_options *options,
                } else if (!strcmp(cur_opt, "lazy-loading-on")) {
                        options->lazy_loading_enabled = 1;
                        options->lazy_loading_overridden = 1;
+               } else if (!strcmp(cur_opt, "disable-summary")) {
+                       options->disable_summary = 1;
                } else if (!strcmp(cur_opt, "empty-lost-and-found-off")) {
                        options->empty_lost_and_found = 0;
                        options->empty_lost_and_found_overridden = 1;
                } else if (!strcmp(cur_opt, "empty-lost-and-found-on")) {
                        options->empty_lost_and_found = 1;
                        options->empty_lost_and_found_overridden = 1;
-               } else if (!strcmp(cur_opt, "no-cache"))
+               } else if (!strcmp(cur_opt, "no-cache")) {
                        options->no_cache = 1;
-               else if (!strcmp(cur_opt, "no-checkpoint-read"))
+               } else if (!strcmp(cur_opt, "no-checkpoint-read")) {
                        options->skip_checkpoint_read = 1;
-               else if (!strcmp(cur_opt, "no-checkpoint-write"))
+               } else if (!strcmp(cur_opt, "no-checkpoint-write")) {
                        options->skip_checkpoint_write = 1;
-               else if (!strcmp(cur_opt, "no-checkpoint")) {
+               else if (!strcmp(cur_opt, "no-checkpoint")) {
                        options->skip_checkpoint_read = 1;
                        options->skip_checkpoint_write = 1;
                } else {
@@ -2668,6 +2627,11 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        struct yaffs_linux_context *context_iterator;
        struct list_head *l;
 
+       if (!sb) {
+               printk(KERN_INFO "yaffs: sb is NULL\n");
+               return NULL;
+        }
+
        sb->s_magic = YAFFS_MAGIC;
        sb->s_op = &yaffs_super_ops;
        sb->s_flags |= MS_NOATIME;
@@ -2678,9 +2642,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        sb->s_export_op = &yaffs_export_ops;
 #endif
 
-       if (!sb)
-               printk(KERN_INFO "yaffs: sb is NULL\n");
-       else if (!sb->s_dev)
+       if (!sb->s_dev)
                printk(KERN_INFO "yaffs: sb->s_dev is NULL\n");
        else if (!yaffs_devname(sb, devname_buf))
                printk(KERN_INFO "yaffs: devname is NULL\n");
@@ -2704,14 +2666,15 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        sb->s_blocksize = PAGE_CACHE_SIZE;
        sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_read_super: Using yaffs%d\n"), yaffs_version));
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_read_super: block size %d\n"), (int)(sb->s_blocksize)));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_read_super: Using yaffs%d", yaffs_version);
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_read_super: block size %d", (int)(sb->s_blocksize));
 
-       T(YAFFS_TRACE_ALWAYS,
-         (TSTR("yaffs: Attempting MTD mount of %u.%u,\"%s\"\n"),
-          MAJOR(sb->s_dev), MINOR(sb->s_dev), yaffs_devname(sb, devname_buf)));
+       yaffs_trace(YAFFS_TRACE_ALWAYS,
+               "yaffs: Attempting MTD mount of %u.%u,\"%s\"",
+               MAJOR(sb->s_dev), MINOR(sb->s_dev),
+               yaffs_devname(sb, devname_buf));
 
        /* Check it's an mtd device..... */
        if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
@@ -2720,49 +2683,46 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        /* Get the device */
        mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
        if (!mtd) {
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR("yaffs: MTD device #%u doesn't appear to exist\n"),
-                  MINOR(sb->s_dev)));
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "yaffs: MTD device #%u doesn't appear to exist",
+                       MINOR(sb->s_dev));
                return NULL;
        }
        /* Check it's NAND */
        if (mtd->type != MTD_NANDFLASH) {
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR("yaffs: MTD device is not NAND it's type %d\n"),
-                  mtd->type));
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "yaffs: MTD device is not NAND it's type %d",
+                       mtd->type);
                return NULL;
        }
 
-       T(YAFFS_TRACE_OS, (TSTR(" erase %p\n"), mtd->erase));
-       T(YAFFS_TRACE_OS, (TSTR(" read %p\n"), mtd->read));
-       T(YAFFS_TRACE_OS, (TSTR(" write %p\n"), mtd->write));
-       T(YAFFS_TRACE_OS, (TSTR(" readoob %p\n"), mtd->read_oob));
-       T(YAFFS_TRACE_OS, (TSTR(" writeoob %p\n"), mtd->write_oob));
-       T(YAFFS_TRACE_OS, (TSTR(" block_isbad %p\n"), mtd->block_isbad));
-       T(YAFFS_TRACE_OS, (TSTR(" block_markbad %p\n"), mtd->block_markbad));
-       T(YAFFS_TRACE_OS, (TSTR(" %s %d\n"), WRITE_SIZE_STR, WRITE_SIZE(mtd)));
-       T(YAFFS_TRACE_OS, (TSTR(" oobsize %d\n"), mtd->oobsize));
-       T(YAFFS_TRACE_OS, (TSTR(" erasesize %d\n"), mtd->erasesize));
+       yaffs_trace(YAFFS_TRACE_OS, " erase %p", mtd->erase);
+       yaffs_trace(YAFFS_TRACE_OS, " read %p", mtd->read);
+       yaffs_trace(YAFFS_TRACE_OS, " write %p", mtd->write);
+       yaffs_trace(YAFFS_TRACE_OS, " readoob %p", mtd->read_oob);
+       yaffs_trace(YAFFS_TRACE_OS, " writeoob %p", mtd->write_oob);
+       yaffs_trace(YAFFS_TRACE_OS, " block_isbad %p", mtd->block_isbad);
+       yaffs_trace(YAFFS_TRACE_OS, " block_markbad %p", mtd->block_markbad);
+       yaffs_trace(YAFFS_TRACE_OS, " %s %d", WRITE_SIZE_STR, WRITE_SIZE(mtd));
+       yaffs_trace(YAFFS_TRACE_OS, " oobsize %d", mtd->oobsize);
+       yaffs_trace(YAFFS_TRACE_OS, " erasesize %d", mtd->erasesize);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-       T(YAFFS_TRACE_OS, (TSTR(" size %u\n"), mtd->size));
+       yaffs_trace(YAFFS_TRACE_OS, " size %u", mtd->size);
 #else
-       T(YAFFS_TRACE_OS, (TSTR(" size %lld\n"), mtd->size));
+       yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size);
 #endif
 
-#ifdef CONFIG_YAFFS_AUTO_YAFFS2
-
-       if (yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: auto selecting yaffs2\n")));
+       if (yaffs_auto_select && yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) {
+               yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs2");
                yaffs_version = 2;
        }
 
        /* Added NCB 26/5/2006 for completeness */
        if (yaffs_version == 2 && !options.inband_tags
            && WRITE_SIZE(mtd) == 512) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: auto selecting yaffs1\n")));
+               yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs1");
                yaffs_version = 1;
        }
-#endif
 
        if (yaffs_version == 2) {
                /* Check for version 2 style functions */
@@ -2775,18 +2735,18 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
                    !mtd->write_ecc ||
                    !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
 #endif
-                       T(YAFFS_TRACE_ALWAYS,
-                         (TSTR("yaffs: MTD device does not support required "
-                               "functions\n")));
+                       yaffs_trace(YAFFS_TRACE_ALWAYS,
+                               "MTD device does not support required functions"
+                       );
                        return NULL;
                }
 
                if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
                     mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
                    !options.inband_tags) {
-                       T(YAFFS_TRACE_ALWAYS,
-                         (TSTR("yaffs: MTD device does not have the "
-                               "right page sizes\n")));
+                       yaffs_trace(YAFFS_TRACE_ALWAYS,
+                               "MTD device does not have the right page sizes"
+                       );
                        return NULL;
                }
        } else {
@@ -2798,17 +2758,17 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
                    !mtd->write_ecc ||
                    !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
 #endif
-                       T(YAFFS_TRACE_ALWAYS,
-                         (TSTR("yaffs: MTD device does not support required "
-                               "functions\n")));
+                       yaffs_trace(YAFFS_TRACE_ALWAYS,
+                               "MTD device does not support required functions"
+                       );
                        return NULL;
                }
 
                if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
                    mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
-                       T(YAFFS_TRACE_ALWAYS,
-                         (TSTR("yaffs: MTD device does not support have the "
-                               "right page sizes\n")));
+                       yaffs_trace(YAFFS_TRACE_ALWAYS,
+                               "MTD device does not support have the right page sizes"
+                       );
                        return NULL;
                }
        }
@@ -2821,7 +2781,8 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        if (!read_only && !(mtd->flags & MTD_WRITEABLE)) {
                read_only = 1;
                printk(KERN_INFO
-                      "yaffs: mtd is read only, setting superblock read only");
+                      "yaffs: mtd is read only, setting superblock read only\n"
+               );
                sb->s_flags |= MS_RDONLY;
        }
 
@@ -2839,9 +2800,9 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
        if (!dev) {
                /* Deep shit could not allocate device structure */
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR("yaffs_read_super: Failed trying to allocate "
-                       "struct yaffs_dev. \n")));
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "yaffs_read_super: Failed trying to allocate struct yaffs_dev."
+               );
                return NULL;
        }
        memset(dev, 0, sizeof(struct yaffs_dev));
@@ -2861,68 +2822,35 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        sb->u.generic_sbp = dev;
 #endif
 
+
        dev->driver_context = mtd;
        param->name = mtd->name;
 
        /* Set up the memory size parameters.... */
 
-       n_blocks =
-           YCALCBLOCKS(mtd->size,
-                       (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
 
-       param->start_block = 0;
-       param->end_block = n_blocks - 1;
-       param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK;
-       param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK;
        param->n_reserved_blocks = 5;
        param->n_caches = (options.no_cache) ? 0 : 10;
        param->inband_tags = options.inband_tags;
 
-#ifdef CONFIG_YAFFS_DISABLE_LAZY_LOAD
-       param->disable_lazy_load = 1;
-#endif
-#ifdef CONFIG_YAFFS_XATTR
        param->enable_xattr = 1;
-#endif
        if (options.lazy_loading_overridden)
                param->disable_lazy_load = !options.lazy_loading_enabled;
 
-#ifdef CONFIG_YAFFS_DISABLE_TAGS_ECC
-       param->no_tags_ecc = 1;
-#endif
-
-#ifdef CONFIG_YAFFS_DISABLE_BACKGROUND
-#else
        param->defered_dir_update = 1;
-#endif
 
        if (options.tags_ecc_overridden)
                param->no_tags_ecc = !options.tags_ecc_on;
 
-#ifdef CONFIG_YAFFS_EMPTY_LOST_AND_FOUND
        param->empty_lost_n_found = 1;
-#endif
-
-#ifdef CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING
-       param->refresh_period = 0;
-#else
        param->refresh_period = 500;
-#endif
-
-#ifdef CONFIG_YAFFS__ALWAYS_CHECK_CHUNK_ERASED
-       param->always_check_erased = 1;
-#endif
+       param->disable_summary = options.disable_summary;
 
        if (options.empty_lost_and_found_overridden)
                param->empty_lost_n_found = options.empty_lost_and_found;
 
        /* ... and the functions. */
        if (yaffs_version == 2) {
-               param->write_chunk_tags_fn = nandmtd2_write_chunk_tags;
-               param->read_chunk_tags_fn = nandmtd2_read_chunk_tags;
-               param->bad_block_fn = nandmtd2_mark_block_bad;
-               param->query_block_fn = nandmtd2_query_block;
-               yaffs_dev_to_lc(dev)->spare_buffer = YMALLOC(mtd->oobsize);
                param->is_yaffs2 = 1;
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
                param->total_bytes_per_chunk = mtd->writesize;
@@ -2936,36 +2864,25 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
                param->start_block = 0;
                param->end_block = n_blocks - 1;
        } else {
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-               /* use the MTD interface in yaffs_mtdif1.c */
-               param->write_chunk_tags_fn = nandmtd1_write_chunk_tags;
-               param->read_chunk_tags_fn = nandmtd1_read_chunk_tags;
-               param->bad_block_fn = nandmtd1_mark_block_bad;
-               param->query_block_fn = nandmtd1_query_block;
-#else
-               param->write_chunk_fn = nandmtd_write_chunk;
-               param->read_chunk_fn = nandmtd_read_chunk;
-#endif
                param->is_yaffs2 = 0;
+               n_blocks = YCALCBLOCKS(mtd->size,
+                            YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
+
+               param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK;
+               param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK;
        }
-       /* ... and common functions */
-       param->erase_fn = nandmtd_erase_block;
-       param->initialise_flash_fn = nandmtd_initialise;
 
-       yaffs_dev_to_lc(dev)->put_super_fn = yaffs_mtd_put_super;
+       param->start_block = 0;
+       param->end_block = n_blocks - 1;
+
+       yaffs_mtd_drv_install(dev);
 
        param->sb_dirty_fn = yaffs_touch_super;
-       param->gc_control = yaffs_gc_control_callback;
+       param->gc_control_fn = yaffs_gc_control_callback;
 
        yaffs_dev_to_lc(dev)->super = sb;
 
-#ifndef CONFIG_YAFFS_DOES_ECC
        param->use_nand_ecc = 1;
-#endif
-
-#ifdef CONFIG_YAFFS_DISABLE_WIDE_TNODES
-       param->wide_tnodes_disabled = 1;
-#endif
 
        param->skip_checkpt_rd = options.skip_checkpoint_read;
        param->skip_checkpt_wr = options.skip_checkpoint_write;
@@ -2999,9 +2916,9 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
        err = yaffs_guts_initialise(dev);
 
-       T(YAFFS_TRACE_OS,
-         (TSTR("yaffs_read_super: guts initialised %s\n"),
-          (err == YAFFS_OK) ? "OK" : "FAILED"));
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_read_super: guts initialised %s",
+               (err == YAFFS_OK) ? "OK" : "FAILED");
 
        if (err == YAFFS_OK)
                yaffs_bg_start(dev);
@@ -3009,6 +2926,8 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        if (!context->bg_thread)
                param->defered_dir_update = 0;
 
+       sb->s_maxbytes = yaffs_max_file_size(dev);
+
        /* Release lock before yaffs_get_inode() */
        yaffs_gross_unlock(dev);
 
@@ -3022,11 +2941,11 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        inode->i_op = &yaffs_dir_inode_operations;
        inode->i_fop = &yaffs_dir_operations;
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: got root inode\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: got root inode");
 
        root = d_alloc_root(inode);
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: d_alloc_root done\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: d_alloc_root done");
 
        if (!root) {
                iput(inode);
@@ -3034,11 +2953,11 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
        }
        sb->s_root = root;
        sb->s_dirt = !dev->is_checkpointed;
-       T(YAFFS_TRACE_ALWAYS,
-         (TSTR("yaffs_read_super: is_checkpointed %d\n"),
-          dev->is_checkpointed));
+       yaffs_trace(YAFFS_TRACE_ALWAYS,
+               "yaffs_read_super: is_checkpointed %d",
+               dev->is_checkpointed);
 
-       T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: done\n")));
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: done");
        return sb;
 }
 
@@ -3049,7 +2968,13 @@ static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data,
        return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL;
 }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+static struct dentry *yaffs_mount(struct file_system_type *fs_type, int flags,
+        const char *dev_name, void *data)
+{
+    return mount_bdev(fs_type, flags, dev_name, data, yaffs_internal_read_super_mtd);
+}
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 static int yaffs_read_super(struct file_system_type *fs,
                            int flags, const char *dev_name,
                            void *data, struct vfsmount *mnt)
@@ -3072,8 +2997,12 @@ static struct super_block *yaffs_read_super(struct file_system_type *fs,
 static struct file_system_type yaffs_fs_type = {
        .owner = THIS_MODULE,
        .name = "yaffs",
-       .get_sb = yaffs_read_super,
-       .kill_sb = kill_block_super,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+        .mount = yaffs_mount,
+#else
+        .get_sb = yaffs_read_super,
+#endif
+       .kill_sb = kill_block_super,
        .fs_flags = FS_REQUIRES_DEV,
 };
 #else
@@ -3087,7 +3016,6 @@ static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super,
                      FS_REQUIRES_DEV);
 #endif
 
-#ifdef CONFIG_YAFFS_YAFFS2
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
 static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
@@ -3096,7 +3024,13 @@ static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data,
        return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL;
 }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+static struct dentry *yaffs2_mount(struct file_system_type *fs_type, int flags,
+        const char *dev_name, void *data)
+{
+        return mount_bdev(fs_type, flags, dev_name, data, yaffs2_internal_read_super_mtd);
+}
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 static int yaffs2_read_super(struct file_system_type *fs,
                             int flags, const char *dev_name, void *data,
                             struct vfsmount *mnt)
@@ -3118,8 +3052,12 @@ static struct super_block *yaffs2_read_super(struct file_system_type *fs,
 static struct file_system_type yaffs2_fs_type = {
        .owner = THIS_MODULE,
        .name = "yaffs2",
-       .get_sb = yaffs2_read_super,
-       .kill_sb = kill_block_super,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+        .mount = yaffs2_mount,
+#else
+        .get_sb = yaffs2_read_super,
+#endif
+       .kill_sb = kill_block_super,
        .fs_flags = FS_REQUIRES_DEV,
 };
 #else
@@ -3133,43 +3071,32 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super,
                      FS_REQUIRES_DEV);
 #endif
 
-#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, struct yaffs_dev *dev)
 {
-       buf +=
-           sprintf(buf, "start_block.......... %d\n", dev->param.start_block);
-       buf += sprintf(buf, "end_block............ %d\n", dev->param.end_block);
-       buf +=
-           sprintf(buf, "total_bytes_per_chunk %d\n",
-                   dev->param.total_bytes_per_chunk);
-       buf +=
-           sprintf(buf, "use_nand_ecc......... %d\n", dev->param.use_nand_ecc);
-       buf +=
-           sprintf(buf, "no_tags_ecc.......... %d\n", dev->param.no_tags_ecc);
-       buf += sprintf(buf, "is_yaffs2............ %d\n", dev->param.is_yaffs2);
-       buf +=
-           sprintf(buf, "inband_tags.......... %d\n", dev->param.inband_tags);
-       buf +=
-           sprintf(buf, "empty_lost_n_found... %d\n",
-                   dev->param.empty_lost_n_found);
-       buf +=
-           sprintf(buf, "disable_lazy_load.... %d\n",
-                   dev->param.disable_lazy_load);
-       buf +=
-           sprintf(buf, "refresh_period....... %d\n",
-                   dev->param.refresh_period);
-       buf += sprintf(buf, "n_caches............. %d\n", dev->param.n_caches);
-       buf +=
-           sprintf(buf, "n_reserved_blocks.... %d\n",
-                   dev->param.n_reserved_blocks);
-       buf +=
-           sprintf(buf, "always_check_erased.. %d\n",
-                   dev->param.always_check_erased);
-
+       struct yaffs_param *param = &dev->param;
+
+       buf += sprintf(buf, "start_block.......... %d\n", param->start_block);
+       buf += sprintf(buf, "end_block............ %d\n", param->end_block);
+       buf += sprintf(buf, "total_bytes_per_chunk %d\n",
+                               param->total_bytes_per_chunk);
+       buf += sprintf(buf, "use_nand_ecc......... %d\n", param->use_nand_ecc);
+       buf += sprintf(buf, "no_tags_ecc.......... %d\n", param->no_tags_ecc);
+       buf += sprintf(buf, "is_yaffs2............ %d\n", param->is_yaffs2);
+       buf += sprintf(buf, "inband_tags.......... %d\n", param->inband_tags);
+       buf += sprintf(buf, "empty_lost_n_found... %d\n",
+                               param->empty_lost_n_found);
+       buf += sprintf(buf, "disable_lazy_load.... %d\n",
+                               param->disable_lazy_load);
+       buf += sprintf(buf, "refresh_period....... %d\n",
+                               param->refresh_period);
+       buf += sprintf(buf, "n_caches............. %d\n", param->n_caches);
+       buf += sprintf(buf, "n_reserved_blocks.... %d\n",
+                               param->n_reserved_blocks);
+       buf += sprintf(buf, "always_check_erased.. %d\n",
+                               param->always_check_erased);
        buf += sprintf(buf, "\n");
 
        return buf;
@@ -3177,14 +3104,15 @@ static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev)
 
 static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev)
 {
-       buf +=
-           sprintf(buf, "data_bytes_per_chunk. %d\n",
-                   dev->data_bytes_per_chunk);
+       buf += sprintf(buf, "max file size....... %lld\n",
+                               (long long) yaffs_max_file_size(dev));
+       buf += sprintf(buf, "data_bytes_per_chunk. %d\n",
+                               dev->data_bytes_per_chunk);
        buf += sprintf(buf, "chunk_grp_bits....... %d\n", dev->chunk_grp_bits);
        buf += sprintf(buf, "chunk_grp_size....... %d\n", dev->chunk_grp_size);
        buf += sprintf(buf, "n_erased_blocks...... %d\n", dev->n_erased_blocks);
-       buf +=
-           sprintf(buf, "blocks_in_checkpt.... %d\n", dev->blocks_in_checkpt);
+       buf += sprintf(buf, "blocks_in_checkpt.... %d\n",
+                               dev->blocks_in_checkpt);
        buf += sprintf(buf, "\n");
        buf += sprintf(buf, "n_tnodes............. %d\n", dev->n_tnodes);
        buf += sprintf(buf, "n_obj................ %d\n", dev->n_obj);
@@ -3195,29 +3123,30 @@ static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev)
        buf += sprintf(buf, "n_erasures........... %u\n", dev->n_erasures);
        buf += sprintf(buf, "n_gc_copies.......... %u\n", dev->n_gc_copies);
        buf += sprintf(buf, "all_gcs.............. %u\n", dev->all_gcs);
-       buf +=
-           sprintf(buf, "passive_gc_count..... %u\n", dev->passive_gc_count);
-       buf +=
-           sprintf(buf, "oldest_dirty_gc_count %u\n",
-                   dev->oldest_dirty_gc_count);
+       buf += sprintf(buf, "passive_gc_count..... %u\n",
+                               dev->passive_gc_count);
+       buf += sprintf(buf, "oldest_dirty_gc_count %u\n",
+                               dev->oldest_dirty_gc_count);
        buf += sprintf(buf, "n_gc_blocks.......... %u\n", dev->n_gc_blocks);
        buf += sprintf(buf, "bg_gcs............... %u\n", dev->bg_gcs);
-       buf +=
-           sprintf(buf, "n_retired_writes..... %u\n", dev->n_retired_writes);
-       buf +=
-           sprintf(buf, "n_retired_blocks..... %u\n", dev->n_retired_blocks);
+       buf += sprintf(buf, "n_retried_writes..... %u\n",
+                               dev->n_retried_writes);
+       buf += sprintf(buf, "n_retired_blocks..... %u\n",
+                               dev->n_retired_blocks);
        buf += sprintf(buf, "n_ecc_fixed.......... %u\n", dev->n_ecc_fixed);
        buf += sprintf(buf, "n_ecc_unfixed........ %u\n", dev->n_ecc_unfixed);
-       buf +=
-           sprintf(buf, "n_tags_ecc_fixed..... %u\n", dev->n_tags_ecc_fixed);
-       buf +=
-           sprintf(buf, "n_tags_ecc_unfixed... %u\n", dev->n_tags_ecc_unfixed);
+       buf += sprintf(buf, "n_tags_ecc_fixed..... %u\n",
+                               dev->n_tags_ecc_fixed);
+       buf += sprintf(buf, "n_tags_ecc_unfixed... %u\n",
+                               dev->n_tags_ecc_unfixed);
        buf += sprintf(buf, "cache_hits........... %u\n", dev->cache_hits);
        buf += sprintf(buf, "n_deleted_files...... %u\n", dev->n_deleted_files);
-       buf +=
-           sprintf(buf, "n_unlinked_files..... %u\n", dev->n_unlinked_files);
+       buf += sprintf(buf, "n_unlinked_files..... %u\n",
+                               dev->n_unlinked_files);
        buf += sprintf(buf, "refresh_count........ %u\n", dev->refresh_count);
        buf += sprintf(buf, "n_bg_deletions....... %u\n", dev->n_bg_deletions);
+       buf += sprintf(buf, "tags_used............ %u\n", dev->tags_used);
+       buf += sprintf(buf, "summary_used......... %u\n", dev->summary_used);
 
        return buf;
 }
@@ -3268,8 +3197,9 @@ static int yaffs_proc_read(char *page,
                                    sprintf(buf, "\nDevice %d \"%s\"\n", n,
                                            dev->param.name);
                                buf = yaffs_dump_dev_part0(buf, dev);
-                       } else
+                       } else {
                                buf = yaffs_dump_dev_part1(buf, dev);
+                        }
 
                        break;
                }
@@ -3279,37 +3209,6 @@ static int yaffs_proc_read(char *page,
        return buf - page < count ? buf - page : count;
 }
 
-static int yaffs_stats_proc_read(char *page,
-                                char **start,
-                                off_t offset, int count, int *eof, void *data)
-{
-       struct list_head *item;
-       char *buf = page;
-       int n = 0;
-
-       mutex_lock(&yaffs_context_lock);
-
-       /* Locate and print the Nth entry.  Order N-squared but N is small. */
-       list_for_each(item, &yaffs_context_list) {
-               struct yaffs_linux_context *dc =
-                   list_entry(item, struct yaffs_linux_context, context_list);
-               struct yaffs_dev *dev = dc->dev;
-
-               int erased_chunks;
-
-               erased_chunks =
-                   dev->n_erased_blocks * dev->param.chunks_per_block;
-
-               buf += sprintf(buf, "%d, %d, %d, %u, %u, %u, %u\n",
-                              n, dev->n_free_chunks, erased_chunks,
-                              dev->bg_gcs, dev->oldest_dirty_gc_count,
-                              dev->n_obj, dev->n_tnodes);
-       }
-       mutex_unlock(&yaffs_context_lock);
-
-       return buf - page < count ? buf - page : count;
-}
-
 /**
  * Set the verbosity of the warnings and error messages.
  *
@@ -3320,35 +3219,36 @@ static struct {
        char *mask_name;
        unsigned mask_bitfield;
 } mask_flags[] = {
-       {
-       "allocate", YAFFS_TRACE_ALLOCATE}, {
-       "always", YAFFS_TRACE_ALWAYS}, {
-       "background", YAFFS_TRACE_BACKGROUND}, {
-       "bad_blocks", YAFFS_TRACE_BAD_BLOCKS}, {
-       "buffers", YAFFS_TRACE_BUFFERS}, {
-       "bug", YAFFS_TRACE_BUG}, {
-       "checkpt", YAFFS_TRACE_CHECKPOINT}, {
-       "deletion", YAFFS_TRACE_DELETION}, {
-       "erase", YAFFS_TRACE_ERASE}, {
-       "error", YAFFS_TRACE_ERROR}, {
-       "gc_detail", YAFFS_TRACE_GC_DETAIL}, {
-       "gc", YAFFS_TRACE_GC}, {
-       "lock", YAFFS_TRACE_LOCK}, {
-       "mtd", YAFFS_TRACE_MTD}, {
-       "nandaccess", YAFFS_TRACE_NANDACCESS}, {
-       "os", YAFFS_TRACE_OS}, {
-       "scan_debug", YAFFS_TRACE_SCAN_DEBUG}, {
-       "scan", YAFFS_TRACE_SCAN}, {
-       "tracing", YAFFS_TRACE_TRACING}, {
-       "sync", YAFFS_TRACE_SYNC}, {
-       "write", YAFFS_TRACE_WRITE}, {
-       "verify", YAFFS_TRACE_VERIFY}, {
-       "verify_nand", YAFFS_TRACE_VERIFY_NAND}, {
-       "verify_full", YAFFS_TRACE_VERIFY_FULL}, {
-       "verify_all", YAFFS_TRACE_VERIFY_ALL}, {
-       "all", 0xffffffff}, {
-       "none", 0}, {
-NULL, 0},};
+       {"allocate", YAFFS_TRACE_ALLOCATE},
+       {"always", YAFFS_TRACE_ALWAYS},
+       {"background", YAFFS_TRACE_BACKGROUND},
+       {"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
+       {"buffers", YAFFS_TRACE_BUFFERS},
+       {"bug", YAFFS_TRACE_BUG},
+       {"checkpt", YAFFS_TRACE_CHECKPOINT},
+       {"deletion", YAFFS_TRACE_DELETION},
+       {"erase", YAFFS_TRACE_ERASE},
+       {"error", YAFFS_TRACE_ERROR},
+       {"gc_detail", YAFFS_TRACE_GC_DETAIL},
+       {"gc", YAFFS_TRACE_GC},
+       {"lock", YAFFS_TRACE_LOCK},
+       {"mtd", YAFFS_TRACE_MTD},
+       {"nandaccess", YAFFS_TRACE_NANDACCESS},
+       {"os", YAFFS_TRACE_OS},
+       {"scan_debug", YAFFS_TRACE_SCAN_DEBUG},
+       {"scan", YAFFS_TRACE_SCAN},
+       {"mount", YAFFS_TRACE_MOUNT},
+       {"tracing", YAFFS_TRACE_TRACING},
+       {"sync", YAFFS_TRACE_SYNC},
+       {"write", YAFFS_TRACE_WRITE},
+       {"verify", YAFFS_TRACE_VERIFY},
+       {"verify_nand", YAFFS_TRACE_VERIFY_NAND},
+       {"verify_full", YAFFS_TRACE_VERIFY_FULL},
+       {"verify_all", YAFFS_TRACE_VERIFY_ALL},
+       {"all", 0xffffffff},
+       {"none", 0},
+       {NULL, 0},
+};
 
 #define MAX_MASK_NAME_LENGTH 40
 static int yaffs_proc_write_trace_options(struct file *file, const char *buf,
@@ -3470,14 +3370,8 @@ static int __init init_yaffs_fs(void)
        int error = 0;
        struct file_system_to_install *fsinst;
 
-       T(YAFFS_TRACE_ALWAYS,
-         (TSTR("yaffs built " __DATE__ " " __TIME__ " Installing. \n")));
-
-#ifdef CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED
-       T(YAFFS_TRACE_ALWAYS,
-         (TSTR
-          (" \n\n\n\nYAFFS-WARNING CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED selected.\n\n\n\n")));
-#endif
+       yaffs_trace(YAFFS_TRACE_ALWAYS,
+               "yaffs built " __DATE__ " " __TIME__ " Installing.");
 
        mutex_init(&yaffs_context_lock);
 
@@ -3489,18 +3383,9 @@ static int __init init_yaffs_fs(void)
                my_proc_entry->write_proc = yaffs_proc_write;
                my_proc_entry->read_proc = yaffs_proc_read;
                my_proc_entry->data = NULL;
-       } else
-               return -ENOMEM;
-
-       debug_proc_entry = create_proc_entry("yaffs_stats",
-                                            S_IRUGO | S_IFREG, YPROC_ROOT);
-
-       if (debug_proc_entry) {
-               debug_proc_entry->write_proc = NULL;
-               debug_proc_entry->read_proc = yaffs_stats_proc_read;
-               debug_proc_entry->data = NULL;
-       } else
+       } else {
                return -ENOMEM;
+        }
 
        /* Now add the file system entries */
 
@@ -3534,11 +3419,10 @@ static void __exit exit_yaffs_fs(void)
 
        struct file_system_to_install *fsinst;
 
-       T(YAFFS_TRACE_ALWAYS,
-         (TSTR("yaffs built " __DATE__ " " __TIME__ " removing. \n")));
+       yaffs_trace(YAFFS_TRACE_ALWAYS,
+               "yaffs built " __DATE__ " " __TIME__ " removing.");
 
        remove_proc_entry("yaffs", YPROC_ROOT);
-       remove_proc_entry("yaffs_stats", YPROC_ROOT);
 
        fsinst = fs_to_install;
 
@@ -3555,5 +3439,5 @@ module_init(init_yaffs_fs)
     module_exit(exit_yaffs_fs)
 
     MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
-MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2010");
+MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2011");
 MODULE_LICENSE("GPL");