yaffs linux: Rationalise and fix compilation for Linux 3.4 and 3.5
authorCharles Manning <cdhmanning@gmail.com>
Fri, 18 Jan 2013 01:54:36 +0000 (14:54 +1300)
committerCharles Manning <cdhmanning@gmail.com>
Fri, 18 Jan 2013 01:58:20 +0000 (14:58 +1300)
Some major clean up to get rid of as many prototypes as possible.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
yaffs_linux.h
yaffs_mtdif.h
yaffs_mtdif_multi.c
yaffs_vfs_multi.c

index c541e31..c20ab14 100644 (file)
@@ -31,9 +31,18 @@ struct yaffs_linux_context {
        struct list_head search_contexts;
        struct task_struct *readdir_process;
        unsigned mount_id;
+       int dirty;
 };
 
 #define yaffs_dev_to_lc(dev) ((struct yaffs_linux_context *)((dev)->os_context))
 #define yaffs_dev_to_mtd(dev) ((struct mtd_info *)((dev)->driver_context))
 
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+#define WRITE_SIZE_STR "writesize"
+#define WRITE_SIZE(mtd) ((mtd)->writesize)
+#else
+#define WRITE_SIZE_STR "oobblock"
+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
+#endif
+
 #endif
index e5172eb..9cff224 100644 (file)
@@ -19,5 +19,7 @@
 #include "yaffs_guts.h"
 
 void yaffs_mtd_drv_install(struct yaffs_dev *dev);
-
+struct mtd_info * yaffs_get_mtd_device(dev_t sdev);
+void yaffs_put_mtd_device(struct mtd_info *mtd);
+int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags);
 #endif
index e61699d..bd63855 100644 (file)
 #endif
 
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0))
+#define mtd_erase(m, ei) (m)->erase(m, ei)
+#define mtd_write_oob(m, addr, pops) (m)->write_oob(m, addr, pops)
+#define mtd_read_oob(m, addr, pops) (m)->read_oob(m, addr, pops)
+#define mtd_block_isbad(m, offs) (m)->block_isbad(m, offs)
+#define mtd_block_markbad(m, offs) (m)->block_markbad(m, offs)
+#endif
+
+
+
 int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
@@ -50,7 +60,7 @@ int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
        ei.callback = NULL;
        ei.priv = (u_long) dev;
 
-       retval = mtd->erase(mtd, &ei);
+       retval = mtd_erase(mtd, &ei);
 
        if (retval == 0)
                return YAFFS_OK;
@@ -76,7 +86,7 @@ static        int yaffs_mtd_write(struct yaffs_dev *dev, int nand_chunk,
        ops.datbuf = (u8 *)data;
        ops.oobbuf = (u8 *)oob;
 
-       retval = mtd->write_oob(mtd, addr, &ops);
+       retval = mtd_write_oob(mtd, addr, &ops);
        if (retval) {
                yaffs_trace(YAFFS_TRACE_MTD,
                        "write_oob failed, chunk %d, mtd error %d",
@@ -112,7 +122,7 @@ static int yaffs_mtd_read(struct yaffs_dev *dev, int nand_chunk,
        /* Read page and oob using MTD.
         * Check status and determine ECC result.
         */
-       retval = mtd->read_oob(mtd, addr, &ops);
+       retval = mtd_read_oob(mtd, addr, &ops);
        if (retval)
                yaffs_trace(YAFFS_TRACE_MTD,
                        "read_oob failed, chunk %d, mtd error %d",
@@ -165,7 +175,7 @@ static      int yaffs_mtd_erase(struct yaffs_dev *dev, int block_no)
        ei.callback = NULL;
        ei.priv = (u_long) dev;
 
-       retval = mtd->erase(mtd, &ei);
+       retval = mtd_erase(mtd, &ei);
 
        if (retval == 0)
                return YAFFS_OK;
@@ -181,7 +191,7 @@ static int yaffs_mtd_mark_bad(struct yaffs_dev *dev, int block_no)
 
        yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", block_no);
 
-       retval = mtd->block_markbad(mtd, (loff_t) blocksize * block_no);
+       retval = mtd_block_markbad(mtd, (loff_t) blocksize * block_no);
        return (retval) ? YAFFS_FAIL : YAFFS_OK;
 }
 
@@ -193,7 +203,7 @@ static int yaffs_mtd_check_bad(struct yaffs_dev *dev, int block_no)
 
        yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "checking block %d bad", block_no);
 
-       retval = mtd->block_isbad(mtd, (loff_t) blocksize * block_no);
+       retval = mtd_block_isbad(mtd, (loff_t) blocksize * block_no);
        return (retval) ? YAFFS_FAIL : YAFFS_OK;
 }
 
@@ -208,7 +218,6 @@ static int yaffs_mtd_deinitialise(struct yaffs_dev *dev)
 }
 
 
-
 void yaffs_mtd_drv_install(struct yaffs_dev *dev)
 {
        struct yaffs_driver *drv = &dev->drv;
@@ -221,3 +230,65 @@ void yaffs_mtd_drv_install(struct yaffs_dev *dev)
        drv->drv_initialise_fn = yaffs_mtd_initialise;
        drv->drv_deinitialise_fn = yaffs_mtd_deinitialise;
 }
+
+
+struct mtd_info * yaffs_get_mtd_device(dev_t sdev)
+{
+       struct mtd_info *mtd;
+
+       mtd = yaffs_get_mtd_device(sdev);
+
+       /* Check it's an mtd device..... */
+       if (MAJOR(sdev) != MTD_BLOCK_MAJOR)
+               return NULL;    /* This isn't an mtd device */
+
+       /* Check it's NAND */
+       if (mtd->type != MTD_NANDFLASH) {
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "yaffs: MTD device is not NAND it's type %d",
+                       mtd->type);
+               return NULL;
+       }
+
+       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)
+       yaffs_trace(YAFFS_TRACE_OS, " size %u", mtd->size);
+#else
+       yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size);
+#endif
+
+       return mtd;
+}
+
+int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags)
+{
+       if (yaffs_version == 2) {
+               if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
+                    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
+                   !inband_tags) {
+                       yaffs_trace(YAFFS_TRACE_ALWAYS,
+                               "MTD device does not have the right page sizes"
+                       );
+                       return -1;
+               }
+       } else {
+               if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
+                   mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
+                       yaffs_trace(YAFFS_TRACE_ALWAYS,
+                               "MTD device does not support have the right page sizes"
+                       );
+                       return -1;
+               }
+       }
+
+       return 0;
+}
+
+
+void yaffs_put_mtd_device(struct mtd_info *mtd)
+{
+       if(mtd)
+               put_mtd_device(mtd);
+}
index 3cf6dde..0252211 100644 (file)
 #define Y_INIT_TIMER(a)        init_timer_on_stack(a)
 #endif
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-#define WRITE_SIZE_STR "writesize"
-#define WRITE_SIZE(mtd) ((mtd)->writesize)
-#else
-#define WRITE_SIZE_STR "oobblock"
-#define WRITE_SIZE(mtd) ((mtd)->oobblock)
-#endif
-
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
 #define YAFFS_USE_WRITE_BEGIN_END 1
 #else
 #define YAFFS_USE_WRITE_BEGIN_END 0
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))
+#define YAFFS_SUPER_HAS_DIRTY
+#endif
 
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0))
@@ -200,14 +195,12 @@ MODULE_PARM(yaffs_gc_control, "i");
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
 /* use iget and read_inode */
 #define Y_IGET(sb, inum) iget((sb), (inum))
-static void yaffs_read_inode(struct inode *inode);
 
 #else
 /* Call local equivalent */
 #define YAFFS_USE_OWN_IGET
 #define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
 
-static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
 #endif
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
@@ -226,723 +219,488 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
 #define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->u.generic_sbp)
 #endif
 
-#define update_dir_time(dir) do {\
-                       (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \
-               } 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);
-static ssize_t yaffs_hold_space(struct file *f);
-static void yaffs_release_space(struct file *f);
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-static int yaffs_file_flush(struct file *file, fl_owner_t id);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
+#define Y_CLEAR_INODE(i) clear_inode(i)
 #else
-static int yaffs_file_flush(struct file *file);
+#define Y_CLEAR_INODE(i) end_writeback(i)
 #endif
 
-#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,
-                            int datasync);
-#endif
 
-static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
+#define update_dir_time(dir) do {\
+                       (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \
+               } while (0)
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
-                       struct nameidata *n);
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-                                  struct nameidata *n);
-#else
-static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
-#endif
-static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
-                     struct dentry *dentry);
-static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
-static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
-                        const char *symname);
-static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
+static void yaffs_fill_inode_from_obj(struct inode *inode,
+                                     struct yaffs_obj *obj);
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-                      dev_t dev);
-#else
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-                      int dev);
-#endif
-static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
-                       struct inode *new_dir, struct dentry *new_dentry);
-static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-static int yaffs_sync_fs(struct super_block *sb, int wait);
-static void yaffs_write_super(struct super_block *sb);
-#else
-static int yaffs_sync_fs(struct super_block *sb);
-static int yaffs_write_super(struct super_block *sb);
-#endif
+static void yaffs_gross_lock(struct yaffs_dev *dev)
+{
+       yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locking %p", current);
+       mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock));
+       yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locked %p", current);
+}
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
-#else
-static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
-#endif
+static void yaffs_gross_unlock(struct yaffs_dev *dev)
+{
+       yaffs_trace(YAFFS_TRACE_LOCK, "yaffs unlocking %p", current);
+       mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock));
+}
 
-#ifdef YAFFS_HAS_PUT_INODE
-static void yaffs_put_inode(struct inode *inode);
-#endif
 
-#ifdef YAFFS_HAS_EVICT_INODE
-static void yaffs_evict_inode(struct inode *);
-#else
-static void yaffs_delete_inode(struct inode *);
-static void yaffs_clear_inode(struct inode *);
-#endif
+static int yaffs_readpage_nolock(struct file *f, struct page *pg)
+{
+       /* Lifted from jffs2 */
 
-static int yaffs_readpage(struct file *file, struct page *page);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
-#else
-static int yaffs_writepage(struct page *page);
-#endif
+       struct yaffs_obj *obj;
+       unsigned char *pg_buf;
+       int ret;
+       loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT;
+       struct yaffs_dev *dev;
 
-static int yaffs_setxattr(struct dentry *dentry, const char *name,
-                  const void *value, size_t size, int flags);
-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);
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_readpage_nolock at %lld, size %08x",
+               (long long)pos,
+               (unsigned)PAGE_CACHE_SIZE);
 
-#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-                            loff_t pos, unsigned len, unsigned flags,
-                            struct page **pagep, void **fsdata);
-static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-                          loff_t pos, unsigned len, unsigned copied,
-                          struct page *pg, void *fsdadata);
-#else
-static int yaffs_prepare_write(struct file *f, struct page *pg,
-                              unsigned offset, unsigned to);
-static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
-                             unsigned to);
+       obj = yaffs_dentry_to_obj(f->f_dentry);
 
-#endif
+       dev = obj->my_dev;
 
-static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
-                         int buflen);
-#if (YAFFS_NEW_FOLLOW_LINK == 1)
-void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias);
-static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+       BUG_ON(!PageLocked(pg));
 #else
-static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
+       if (!PageLocked(pg))
+               PAGE_BUG(pg);
 #endif
 
-static void yaffs_touch_super(struct yaffs_dev *dev);
+       pg_buf = kmap(pg);
+       /* FIXME: Can kmap fail? */
 
-static int yaffs_vfs_setattr(struct inode *, struct iattr *);
+       yaffs_gross_lock(dev);
 
-static struct address_space_operations yaffs_file_address_operations = {
-       .readpage = yaffs_readpage,
-       .writepage = yaffs_writepage,
-#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-       .write_begin = yaffs_write_begin,
-       .write_end = yaffs_write_end,
-#else
-       .prepare_write = yaffs_prepare_write,
-       .commit_write = yaffs_commit_write,
-#endif
-};
+       ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE);
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-static const struct file_operations yaffs_file_operations = {
-       .read = do_sync_read,
-       .write = do_sync_write,
-       .aio_read = generic_file_aio_read,
-       .aio_write = generic_file_aio_write,
-       .mmap = generic_file_mmap,
-       .flush = yaffs_file_flush,
-       .fsync = yaffs_sync_object,
-       .splice_read = generic_file_splice_read,
-       .splice_write = generic_file_splice_write,
-       .llseek = generic_file_llseek,
-};
+       yaffs_gross_unlock(dev);
 
-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
+       if (ret >= 0)
+               ret = 0;
 
-static const struct file_operations yaffs_file_operations = {
-       .read = do_sync_read,
-       .write = do_sync_write,
-       .aio_read = generic_file_aio_read,
-       .aio_write = generic_file_aio_write,
-       .mmap = generic_file_mmap,
-       .flush = yaffs_file_flush,
-       .fsync = yaffs_sync_object,
-       .sendfile = generic_file_sendfile,
-};
+       if (ret) {
+               ClearPageUptodate(pg);
+               SetPageError(pg);
+       } else {
+               SetPageUptodate(pg);
+               ClearPageError(pg);
+       }
 
-#else
+       flush_dcache_page(pg);
+       kunmap(pg);
 
-static const struct file_operations yaffs_file_operations = {
-       .read = generic_file_read,
-       .write = generic_file_write,
-       .mmap = generic_file_mmap,
-       .flush = yaffs_file_flush,
-       .fsync = yaffs_sync_object,
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-       .sendfile = generic_file_sendfile,
-#endif
-};
-#endif
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done");
+       return ret;
+}
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-static void zero_user_segment(struct page *page, unsigned start, unsigned end)
+static int yaffs_readpage_unlock(struct file *f, struct page *pg)
 {
-       void *kaddr = kmap_atomic(page, KM_USER0);
-       memset(kaddr + start, 0, end - start);
-       kunmap_atomic(kaddr, KM_USER0);
-       flush_dcache_page(page);
+       int ret = yaffs_readpage_nolock(f, pg);
+       UnlockPage(pg);
+       return ret;
 }
-#endif
 
-static const struct inode_operations yaffs_file_inode_operations = {
-       .setattr = yaffs_setattr,
-       .setxattr = yaffs_setxattr,
-       .getxattr = yaffs_getxattr,
-       .listxattr = yaffs_listxattr,
-       .removexattr = yaffs_removexattr,
-};
+static int yaffs_readpage(struct file *f, struct page *pg)
+{
+       int ret;
 
-static const struct inode_operations yaffs_symlink_inode_operations = {
-       .readlink = yaffs_readlink,
-       .follow_link = yaffs_follow_link,
-#if (YAFFS_NEW_FOLLOW_LINK == 1)
-       .put_link = yaffs_put_link,
-#endif
-       .setattr = yaffs_setattr,
-       .setxattr = yaffs_setxattr,
-       .getxattr = yaffs_getxattr,
-       .listxattr = yaffs_listxattr,
-       .removexattr = yaffs_removexattr,
-};
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage");
+       ret = yaffs_readpage_unlock(f, pg);
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done");
+       return ret;
+}
 
-static const struct inode_operations yaffs_dir_inode_operations = {
-       .create = yaffs_create,
-       .lookup = yaffs_lookup,
-       .link = yaffs_link,
-       .unlink = yaffs_unlink,
-       .symlink = yaffs_symlink,
-       .mkdir = yaffs_mkdir,
-       .rmdir = yaffs_unlink,
-       .mknod = yaffs_mknod,
-       .rename = yaffs_rename,
-       .setattr = yaffs_setattr,
-       .setxattr = yaffs_setxattr,
-       .getxattr = yaffs_getxattr,
-       .listxattr = yaffs_listxattr,
-       .removexattr = yaffs_removexattr,
-};
 
-static const struct file_operations yaffs_dir_operations = {
-       .read = generic_read_dir,
-       .readdir = yaffs_readdir,
-       .fsync = yaffs_sync_object,
-       .llseek = generic_file_llseek,
-};
+static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val)
+{
+       struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev);
 
-static const struct super_operations yaffs_super_ops = {
-       .statfs = yaffs_statfs,
+       if (lc)
+               lc->dirty = val;
 
-#ifndef YAFFS_USE_OWN_IGET
-       .read_inode = yaffs_read_inode,
-#endif
-#ifdef YAFFS_HAS_PUT_INODE
-       .put_inode = yaffs_put_inode,
-#endif
-       .put_super = yaffs_put_super,
-#ifdef YAFFS_HAS_EVICT_INODE
-       .evict_inode = yaffs_evict_inode,
-#else
-       .delete_inode = yaffs_delete_inode,
-       .clear_inode = yaffs_clear_inode,
-#endif
-       .sync_fs = yaffs_sync_fs,
-       .write_super = yaffs_write_super,
-};
+# ifdef YAFFS_SUPER_HAS_DIRTY
+       {
+               struct super_block *sb = lc->super;
 
-static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr)
-{
-#ifdef YAFFS_USE_SETATTR_COPY
-       setattr_copy(inode, attr);
-       return 0;
-#else
-       return inode_setattr(inode, attr);
+               if (sb)
+                       sb->s_dirt = val;
+       }
 #endif
 
 }
 
-static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
+static void yaffs_set_super_dirty(struct yaffs_dev *dev)
 {
-#ifdef YAFFS_USE_TRUNCATE_SETSIZE
-       truncate_setsize(inode, newsize);
-       return 0;
-#else
-       truncate_inode_pages(&inode->i_data, newsize);
-       return 0;
-#endif
-
+       yaffs_set_super_dirty_val(dev, 1);
 }
 
-static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev)
+static void yaffs_clear_super_dirty(struct yaffs_dev *dev)
 {
-       return yaffs_gc_control;
+       yaffs_set_super_dirty_val(dev, 0);
 }
 
-static void yaffs_gross_lock(struct yaffs_dev *dev)
+static int yaffs_check_super_dirty(struct yaffs_dev *dev)
 {
-       yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locking %p", current);
-       mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock));
-       yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locked %p", current);
-}
+       struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev);
 
-static void yaffs_gross_unlock(struct yaffs_dev *dev)
-{
-       yaffs_trace(YAFFS_TRACE_LOCK, "yaffs unlocking %p", current);
-       mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock));
-}
+       if (lc && lc->dirty)
+               return 1;
 
-#ifdef YAFFS_COMPILE_EXPORTFS
+# ifdef YAFFS_SUPER_HAS_DIRTY
+       {
+               struct super_block *sb = lc->super;
 
-static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino,
-                                         uint32_t generation)
-{
-       return Y_IGET(sb, ino);
-}
+               if (sb && sb->s_dirt)
+                       return 1;
+       }
+#endif
+       return 0;
 
-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)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
+#else
+static int yaffs_writepage(struct page *page)
+#endif
 {
-       return generic_fh_to_parent(sb, fid, fh_len, fh_type,
-                                   yaffs2_nfs_get_inode);
-}
+       struct yaffs_dev *dev;
+       struct address_space *mapping = page->mapping;
+       struct inode *inode;
+       unsigned long end_index;
+       char *buffer;
+       struct yaffs_obj *obj;
+       int n_written = 0;
+       unsigned n_bytes;
+       loff_t i_size;
 
-struct dentry *yaffs2_get_parent(struct dentry *dentry)
-{
+       if (!mapping)
+               BUG();
+       inode = mapping->host;
+       if (!inode)
+               BUG();
+       i_size = i_size_read(inode);
 
-       struct super_block *sb = dentry->d_inode->i_sb;
-       struct dentry *parent = ERR_PTR(-ENOENT);
-       struct inode *inode;
-       unsigned long parent_ino;
-       struct yaffs_obj *d_obj;
-       struct yaffs_obj *parent_obj;
+       end_index = i_size >> PAGE_CACHE_SHIFT;
 
-       d_obj = yaffs_inode_to_obj(dentry->d_inode);
+       if (page->index < end_index)
+               n_bytes = PAGE_CACHE_SIZE;
+       else {
+               n_bytes = i_size & (PAGE_CACHE_SIZE - 1);
 
-       if (d_obj) {
-               parent_obj = d_obj->parent;
-               if (parent_obj) {
-                       parent_ino = yaffs_get_obj_inode(parent_obj);
-                       inode = Y_IGET(sb, parent_ino);
+               if (page->index > end_index || !n_bytes) {
+                       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!!");
 
-                       if (IS_ERR(inode)) {
-                               parent = ERR_CAST(inode);
-                       } else {
-                               parent = d_obtain_alias(inode);
-                               if (!IS_ERR(parent)) {
-                                       parent = ERR_PTR(-ENOMEM);
-                                       iput(inode);
-                               }
-                       }
+                       zero_user_segment(page, 0, PAGE_CACHE_SIZE);
+                       set_page_writeback(page);
+                       unlock_page(page);
+                       end_page_writeback(page);
+                       return 0;
                }
        }
 
-       return parent;
-}
+       if (n_bytes != PAGE_CACHE_SIZE)
+               zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE);
 
-/* Just declare a zero structure as a NULL value implies
- * using the default functions of exportfs.
- */
+       get_page(page);
 
-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,
-};
+       buffer = kmap(page);
 
-#endif
+       obj = yaffs_inode_to_obj(inode);
+       dev = obj->my_dev;
+       yaffs_gross_lock(dev);
 
-/*-----------------------------------------------------------------*/
-/* Directory search context allows us to unlock access to yaffs during
- * filldir without causing problems with the directory being modified.
- * This is similar to the tried and tested mechanism used in yaffs direct.
- *
- * A search context iterates along a doubly linked list of siblings in the
- * directory. If the iterating object is deleted then this would corrupt
- * the list iteration, likely causing a crash. The search context avoids
- * this by using the remove_obj_fn to move the search context to the
- * next object before the object is deleted.
- *
- * Many readdirs (and thus seach conexts) may be alive simulateously so
- * each struct yaffs_dev has a list of these.
- *
- * A seach context lives for the duration of a readdir.
- *
- * All these functions must be called while yaffs is locked.
- */
+       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);
 
-struct yaffs_search_context {
-       struct yaffs_dev *dev;
-       struct yaffs_obj *dir_obj;
-       struct yaffs_obj *next_return;
-       struct list_head others;
-};
+       n_written = yaffs_wr_file(obj, buffer,
+                                 ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0);
 
-/*
- * yaffs_new_search() creates a new search context, initialises it and
- * adds it to the device's search context list.
- *
- * Called at start of readdir.
- */
-static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir)
-{
-       struct yaffs_dev *dev = dir->my_dev;
-       struct yaffs_search_context *sc =
-           kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS);
-       if (sc) {
-               sc->dir_obj = dir;
-               sc->dev = dev;
-               if (list_empty(&sc->dir_obj->variant.dir_variant.children))
-                       sc->next_return = NULL;
-               else
-                       sc->next_return =
-                           list_entry(dir->variant.dir_variant.children.next,
-                                      struct yaffs_obj, siblings);
-               INIT_LIST_HEAD(&sc->others);
-               list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts));
-       }
-       return sc;
-}
+       yaffs_set_super_dirty(dev);
 
-/*
- * yaffs_search_end() disposes of a search context and cleans up.
- */
-static void yaffs_search_end(struct yaffs_search_context *sc)
-{
-       if (sc) {
-               list_del(&sc->others);
-               kfree(sc);
-       }
-}
+       yaffs_trace(YAFFS_TRACE_OS,
+               "writepag1: obj = %lld, ino = %lld",
+               obj->variant.file_variant.file_size, inode->i_size);
 
-/*
- * yaffs_search_advance() moves a search context to the next object.
- * Called when the search iterates or when an object removal causes
- * the search context to be moved to the next object.
- */
-static void yaffs_search_advance(struct yaffs_search_context *sc)
-{
-       if (!sc)
-               return;
+       yaffs_gross_unlock(dev);
 
-       if (sc->next_return == NULL ||
-           list_empty(&sc->dir_obj->variant.dir_variant.children))
-               sc->next_return = NULL;
-       else {
-               struct list_head *next = sc->next_return->siblings.next;
+       kunmap(page);
+       set_page_writeback(page);
+       unlock_page(page);
+       end_page_writeback(page);
+       put_page(page);
 
-               if (next == &sc->dir_obj->variant.dir_variant.children)
-                       sc->next_return = NULL; /* end of list */
-               else
-                       sc->next_return =
-                           list_entry(next, struct yaffs_obj, siblings);
-       }
+       return (n_written == n_bytes) ? 0 : -ENOSPC;
 }
 
-/*
- * yaffs_remove_obj_callback() is called when an object is unlinked.
- * We check open search contexts and advance any which are currently
- * on the object being iterated.
- */
-static void yaffs_remove_obj_callback(struct yaffs_obj *obj)
-{
-
-       struct list_head *i;
-       struct yaffs_search_context *sc;
-       struct list_head *search_contexts =
-           &(yaffs_dev_to_lc(obj->my_dev)->search_contexts);
-
-       /* Iterate through the directory search contexts.
-        * If any are currently on the object being removed, then advance
-        * the search context to the next object to prevent a hanging pointer.
-        */
-       list_for_each(i, search_contexts) {
-               sc = list_entry(i, struct yaffs_search_context, others);
-               if (sc->next_return == obj)
-                       yaffs_search_advance(sc);
-       }
+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
+/* For now we just assume few parallel writes and check against a small number. */
+/* Todo: need to do this with a counter to handle parallel reads better */
 
-}
+static ssize_t yaffs_hold_space(struct file *f)
+{
+       struct yaffs_obj *obj;
+       struct yaffs_dev *dev;
 
-/*-----------------------------------------------------------------*/
+       int n_free_chunks;
 
-static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
-                         int buflen)
-{
-       unsigned char *alias;
-       int ret;
+       obj = yaffs_dentry_to_obj(f->f_dentry);
 
-       struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
+       dev = obj->my_dev;
 
        yaffs_gross_lock(dev);
 
-       alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
+       n_free_chunks = yaffs_get_n_free_chunks(dev);
 
        yaffs_gross_unlock(dev);
 
-       if (!alias)
-               return -ENOMEM;
-
-       ret = vfs_readlink(dentry, buffer, buflen, alias);
-       kfree(alias);
-       return ret;
+       return (n_free_chunks > 20) ? 1 : 0;
 }
 
-#if (YAFFS_NEW_FOLLOW_LINK == 1)
-static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-{
-       void *ret;
-#else
-static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
+static void yaffs_release_space(struct file *f)
 {
-       int ret
-#endif
-       unsigned char *alias;
-       int ret_int = 0;
-       struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
+       struct yaffs_obj *obj;
+       struct yaffs_dev *dev;
+
+       obj = yaffs_dentry_to_obj(f->f_dentry);
+
+       dev = obj->my_dev;
 
        yaffs_gross_lock(dev);
 
-       alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
        yaffs_gross_unlock(dev);
-
-       if (!alias) {
-               ret_int = -ENOMEM;
-               goto out;
-       }
-#if (YAFFS_NEW_FOLLOW_LINK == 1)
-       nd_set_link(nd, alias);
-       ret = alias;
-out:
-       if (ret_int)
-               ret = ERR_PTR(ret_int);
-       return ret;
-#else
-       ret = vfs_follow_link(nd, alias);
-       kfree(alias);
-out:
-       if (ret_int)
-               ret = ret_int;
-       return ret;
-#endif
 }
 
-#if (YAFFS_NEW_FOLLOW_LINK == 1)
-void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias)
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
+                            loff_t pos, unsigned len, unsigned flags,
+                            struct page **pagep, void **fsdata)
 {
-       kfree(alias);
-}
-#endif
-
-struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
-                             struct yaffs_obj *obj);
+       struct page *pg = NULL;
+       pgoff_t index = pos >> PAGE_CACHE_SHIFT;
 
-/*
- * Lookup is used to find objects in the fs
- */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+       int ret = 0;
+       int space_held = 0;
 
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-                                  struct nameidata *n)
+       /* Get a page */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+       pg = grab_cache_page_write_begin(mapping, index, flags);
 #else
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
+       pg = __grab_cache_page(mapping, index);
 #endif
-{
-       struct yaffs_obj *obj;
-       struct inode *inode = NULL;     /* NCB 2.5/2.6 needs NULL here */
 
-       struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev;
+       *pagep = pg;
+       if (!pg) {
+               ret = -ENOMEM;
+               goto out;
+       }
+       yaffs_trace(YAFFS_TRACE_OS,
+               "start yaffs_write_begin index %d(%x) uptodate %d",
+               (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0);
 
-       if (current != yaffs_dev_to_lc(dev)->readdir_process)
-               yaffs_gross_lock(dev);
+       /* Get fs space */
+       space_held = yaffs_hold_space(filp);
 
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup for %d:%s",
-               yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name);
+       if (!space_held) {
+               ret = -ENOSPC;
+               goto out;
+       }
 
-       obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name);
+       /* Update page if required */
 
-       obj = yaffs_get_equivalent_obj(obj);    /* in case it was a hardlink */
+       if (!Page_Uptodate(pg))
+               ret = yaffs_readpage_nolock(filp, pg);
 
-       /* Can't hold gross lock when calling yaffs_get_inode() */
-       if (current != yaffs_dev_to_lc(dev)->readdir_process)
-               yaffs_gross_unlock(dev);
+       if (ret)
+               goto out;
 
-       if (obj) {
-               yaffs_trace(YAFFS_TRACE_OS,
-                       "yaffs_lookup found %d", obj->obj_id);
+       /* Happy path return */
+       yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok");
 
-               inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
-       } else {
-               yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found");
+       return 0;
 
+out:
+       yaffs_trace(YAFFS_TRACE_OS,
+               "end yaffs_write_begin fail returning %d", ret);
+       if (space_held)
+               yaffs_release_space(filp);
+       if (pg) {
+               unlock_page(pg);
+               page_cache_release(pg);
        }
-
-/* added NCB for 2.5/6 compatability - forces add even if inode is
- * NULL which creates dentry hash */
-       d_add(dentry, inode);
-
-       return NULL;
+       return ret;
 }
 
-#ifdef YAFFS_HAS_PUT_INODE
+#else
 
-/* For now put inode is just for debugging
- * Put inode is called when the inode **structure** is put.
- */
-static void yaffs_put_inode(struct inode *inode)
+static int yaffs_prepare_write(struct file *f, struct page *pg,
+                              unsigned offset, unsigned to)
 {
-       yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_put_inode: ino %d, count %d"),
-               (int)inode->i_ino, atomic_read(&inode->i_count);
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write");
 
+       if (!Page_Uptodate(pg))
+               return yaffs_readpage_nolock(f, pg);
+       return 0;
 }
 #endif
 
-static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj)
-{
-       /* Clear the association between the inode and
-        * the struct yaffs_obj.
-        */
-       obj->my_inode = NULL;
-       yaffs_inode_to_obj_lv(inode) = NULL;
-
-       /* If the object freeing was deferred, then the real
-        * free happens now.
-        * This should fix the inode inconsistency problem.
-        */
-       yaffs_handle_defered_free(obj);
-}
 
-#ifdef YAFFS_HAS_EVICT_INODE
-/* yaffs_evict_inode combines into one operation what was previously done in
- * yaffs_clear_inode() and yaffs_delete_inode()
- *
- */
-static void yaffs_evict_inode(struct inode *inode)
+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;
+       loff_t ipos;
+       struct inode *inode;
        struct yaffs_dev *dev;
-       int deleteme = 0;
 
-       obj = yaffs_inode_to_obj(inode);
+       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);
+
+       inode = f->f_dentry->d_inode;
+
+       if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
+               ipos = inode->i_size;
+       else
+               ipos = *pos;
 
        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");
+               "yaffs_file_write about to write writing %u(%x) bytes to object %d at %lld",
+               (unsigned)n, (unsigned)n, obj->obj_id, ipos);
 
-       if (!inode->i_nlink && !is_bad_inode(inode))
-               deleteme = 1;
-       truncate_inode_pages(&inode->i_data, 0);
-       end_writeback(inode);
+       n_written = yaffs_wr_file(obj, buf, ipos, n, 0);
+
+       yaffs_set_super_dirty(dev);
+
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_file_write: %d(%x) bytes written",
+               (unsigned)n, (unsigned)n);
+
+       if (n_written > 0) {
+               ipos += n_written;
+               *pos = ipos;
+               if (ipos > inode->i_size) {
+                       inode->i_size = ipos;
+                       inode->i_blocks = (ipos + 511) >> 9;
+
+                       yaffs_trace(YAFFS_TRACE_OS,
+                               "yaffs_file_write size updated to %lld bytes, %d blocks",
+                               ipos, (int)(inode->i_blocks));
+               }
 
-       if (deleteme && obj) {
-               dev = obj->my_dev;
-               yaffs_gross_lock(dev);
-               yaffs_del_obj(obj);
-               yaffs_gross_unlock(dev);
-       }
-       if (obj) {
-               dev = obj->my_dev;
-               yaffs_gross_lock(dev);
-               yaffs_unstitch_obj(inode, obj);
-               yaffs_gross_unlock(dev);
        }
+       yaffs_gross_unlock(dev);
+       return (n_written == 0) && (n > 0) ? -ENOSPC : n_written;
 }
-#else
 
-/* clear is called to tell the fs to release any per-inode data it holds.
- * The object might still exist on disk and is just being thrown out of the cache
- * or else the object has actually been deleted and we're being called via
- * the chain
- *   yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode()
- */
 
-static void yaffs_clear_inode(struct inode *inode)
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
+                          loff_t pos, unsigned len, unsigned copied,
+                          struct page *pg, void *fsdadata)
 {
-       struct yaffs_obj *obj;
-       struct yaffs_dev *dev;
+       int ret = 0;
+       void *addr, *kva;
+       uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
 
-       obj = yaffs_inode_to_obj(inode);
+       kva = kmap(pg);
+       addr = kva + offset_into_page;
 
        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");
+               "yaffs_write_end addr %p pos %lld n_bytes %d",
+               addr, pos, copied);
 
-       if (obj) {
-               dev = obj->my_dev;
-               yaffs_gross_lock(dev);
-               yaffs_unstitch_obj(inode, obj);
-               yaffs_gross_unlock(dev);
+       ret = yaffs_file_write(filp, addr, copied, &pos);
+
+       if (ret != copied) {
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_write_end not same size ret %d  copied %d",
+                       ret, copied);
+               SetPageError(pg);
        }
 
-}
+       kunmap(pg);
 
-/* delete is called when the link count is zero and the inode
- * is put (ie. nobody wants to know about it anymore, time to
- * delete the file).
- * NB Must call clear_inode()
- */
-static void yaffs_delete_inode(struct inode *inode)
+       yaffs_release_space(filp);
+       unlock_page(pg);
+       page_cache_release(pg);
+       return ret;
+}
+#else
+
+static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
+                             unsigned to)
 {
-       struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
-       struct yaffs_dev *dev;
+       void *addr, *kva;
+
+       loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
+       int n_bytes = to - offset;
+       int n_written;
+
+       kva = kmap(pg);
+       addr = kva + offset;
 
        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");
+               "yaffs_commit_write addr %p pos %lld n_bytes %d",
+               addr, pos, n_bytes);
 
-       if (obj) {
-               dev = obj->my_dev;
-               yaffs_gross_lock(dev);
-               yaffs_del_obj(obj);
-               yaffs_gross_unlock(dev);
+       n_written = yaffs_file_write(f, addr, n_bytes, &pos);
+
+       if (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);
        }
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-       truncate_inode_pages(&inode->i_data, 0);
-#endif
-       clear_inode(inode);
+       kunmap(pg);
+
+       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;
 }
 #endif
 
+static struct address_space_operations yaffs_file_address_operations = {
+       .readpage = yaffs_readpage,
+       .writepage = yaffs_writepage,
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+       .write_begin = yaffs_write_begin,
+       .write_end = yaffs_write_end,
+#else
+       .prepare_write = yaffs_prepare_write,
+       .commit_write = yaffs_commit_write,
+#endif
+};
+
+
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 static int yaffs_file_flush(struct file *file, fl_owner_t id)
 #else
@@ -967,410 +725,435 @@ static int yaffs_file_flush(struct file *file)
        return 0;
 }
 
-static int yaffs_readpage_nolock(struct file *f, struct page *pg)
-{
-       /* Lifted from jffs2 */
 
+#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,
+                            int datasync)
+#endif
+{
        struct yaffs_obj *obj;
-       unsigned char *pg_buf;
-       int ret;
-       loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT;
        struct yaffs_dev *dev;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
+       struct dentry *dentry = file->f_path.dentry;
+#endif
 
-       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);
+       obj = yaffs_dentry_to_obj(dentry);
 
        dev = obj->my_dev;
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-       BUG_ON(!PageLocked(pg));
-#else
-       if (!PageLocked(pg))
-               PAGE_BUG(pg);
-#endif
+       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);
+       return 0;
+}
 
-       pg_buf = kmap(pg);
-       /* FIXME: Can kmap fail? */
 
-       yaffs_gross_lock(dev);
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
+static const struct file_operations yaffs_file_operations = {
+       .read = do_sync_read,
+       .write = do_sync_write,
+       .aio_read = generic_file_aio_read,
+       .aio_write = generic_file_aio_write,
+       .mmap = generic_file_mmap,
+       .flush = yaffs_file_flush,
+       .fsync = yaffs_sync_object,
+       .splice_read = generic_file_splice_read,
+       .splice_write = generic_file_splice_write,
+       .llseek = generic_file_llseek,
+};
 
-       ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE);
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
 
-       yaffs_gross_unlock(dev);
+static const struct file_operations yaffs_file_operations = {
+       .read = do_sync_read,
+       .write = do_sync_write,
+       .aio_read = generic_file_aio_read,
+       .aio_write = generic_file_aio_write,
+       .mmap = generic_file_mmap,
+       .flush = yaffs_file_flush,
+       .fsync = yaffs_sync_object,
+       .sendfile = generic_file_sendfile,
+};
 
-       if (ret >= 0)
-               ret = 0;
+#else
 
-       if (ret) {
-               ClearPageUptodate(pg);
-               SetPageError(pg);
-       } else {
-               SetPageUptodate(pg);
-               ClearPageError(pg);
-       }
+static const struct file_operations yaffs_file_operations = {
+       .read = generic_file_read,
+       .write = generic_file_write,
+       .mmap = generic_file_mmap,
+       .flush = yaffs_file_flush,
+       .fsync = yaffs_sync_object,
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+       .sendfile = generic_file_sendfile,
+#endif
+};
+#endif
 
-       flush_dcache_page(pg);
-       kunmap(pg);
 
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done");
-       return ret;
-}
 
-static int yaffs_readpage_unlock(struct file *f, struct page *pg)
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
+static void zero_user_segment(struct page *page, unsigned start, unsigned end)
 {
-       int ret = yaffs_readpage_nolock(f, pg);
-       UnlockPage(pg);
-       return ret;
+       void *kaddr = kmap_atomic(page, KM_USER0);
+       memset(kaddr + start, 0, end - start);
+       kunmap_atomic(kaddr, KM_USER0);
+       flush_dcache_page(page);
 }
+#endif
 
-static int yaffs_readpage(struct file *f, struct page *pg)
+
+static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
 {
-       int ret;
+#ifdef YAFFS_USE_TRUNCATE_SETSIZE
+       truncate_setsize(inode, newsize);
+       return 0;
+#else
+       truncate_inode_pages(&inode->i_data, newsize);
+       return 0;
+#endif
 
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage");
-       ret = yaffs_readpage_unlock(f, pg);
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done");
-       return ret;
 }
 
-/* writepage inspired by/stolen from smbfs */
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
+static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr)
+{
+#ifdef YAFFS_USE_SETATTR_COPY
+       setattr_copy(inode, attr);
+       return 0;
 #else
-static int yaffs_writepage(struct page *page)
+       return inode_setattr(inode, attr);
 #endif
+
+}
+
+static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
 {
+       struct inode *inode = dentry->d_inode;
+       int error = 0;
        struct yaffs_dev *dev;
-       struct address_space *mapping = page->mapping;
-       struct inode *inode;
-       unsigned long end_index;
-       char *buffer;
-       struct yaffs_obj *obj;
-       int n_written = 0;
-       unsigned n_bytes;
-       loff_t i_size;
 
-       if (!mapping)
-               BUG();
-       inode = mapping->host;
-       if (!inode)
-               BUG();
-       i_size = i_size_read(inode);
+       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
 
-       end_index = i_size >> PAGE_CACHE_SHIFT;
+       if (error == 0)
+               error = inode_change_ok(inode, attr);
+       if (error == 0) {
+               int result;
+               if (!error) {
+                       error = yaffs_vfs_setattr(inode, attr);
+                       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;
+                       }
+               }
+               dev = yaffs_inode_to_obj(inode)->my_dev;
+               if (attr->ia_valid & ATTR_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);
+               if (result == YAFFS_OK) {
+                       error = 0;
+               } else {
+                       error = -EPERM;
+               }
+               yaffs_gross_unlock(dev);
 
-       if (page->index < end_index)
-               n_bytes = PAGE_CACHE_SIZE;
-       else {
-               n_bytes = i_size & (PAGE_CACHE_SIZE - 1);
+       }
 
-               if (page->index > end_index || !n_bytes) {
-                       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);
-                       unlock_page(page);
-                       end_page_writeback(page);
-                       return 0;
-               }
-       }
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error);
 
-       if (n_bytes != PAGE_CACHE_SIZE)
-               zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE);
+       return error;
+}
 
-       get_page(page);
+static int yaffs_setxattr(struct dentry *dentry, const char *name,
+                  const void *value, size_t size, int flags)
+{
+       struct inode *inode = dentry->d_inode;
+       int error = 0;
+       struct yaffs_dev *dev;
+       struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-       buffer = kmap(page);
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id);
 
-       obj = yaffs_inode_to_obj(inode);
-       dev = obj->my_dev;
-       yaffs_gross_lock(dev);
+       if (error == 0) {
+               int result;
+               dev = obj->my_dev;
+               yaffs_gross_lock(dev);
+               result = yaffs_set_xattrib(obj, name, value, size, flags);
+               if (result == YAFFS_OK)
+                       error = 0;
+               else if (result < 0)
+                       error = result;
+               yaffs_gross_unlock(dev);
 
-       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);
+       }
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error);
 
-       n_written = yaffs_wr_file(obj, buffer,
-                                 ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0);
+       return error;
+}
 
-       yaffs_touch_super(dev);
+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);
 
        yaffs_trace(YAFFS_TRACE_OS,
-               "writepag1: obj = %lld, ino = %lld",
-               obj->variant.file_variant.file_size, inode->i_size);
+               "yaffs_getxattr \"%s\" from object %d",
+               name, obj->obj_id);
 
-       yaffs_gross_unlock(dev);
+       if (error == 0) {
+               dev = obj->my_dev;
+               yaffs_gross_lock(dev);
+               error = yaffs_get_xattrib(obj, name, buff, size);
+               yaffs_gross_unlock(dev);
 
-       kunmap(page);
-       set_page_writeback(page);
-       unlock_page(page);
-       end_page_writeback(page);
-       put_page(page);
+       }
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error);
 
-       return (n_written == n_bytes) ? 0 : -ENOSPC;
+       return error;
 }
 
-#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-                            loff_t pos, unsigned len, unsigned flags,
-                            struct page **pagep, void **fsdata)
+static int yaffs_removexattr(struct dentry *dentry, const char *name)
 {
-       struct page *pg = NULL;
-       pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-
-       int ret = 0;
-       int space_held = 0;
-
-       /* Get a page */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-       pg = grab_cache_page_write_begin(mapping, index, flags);
-#else
-       pg = __grab_cache_page(mapping, index);
-#endif
+       struct inode *inode = dentry->d_inode;
+       int error = 0;
+       struct yaffs_dev *dev;
+       struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-       *pagep = pg;
-       if (!pg) {
-               ret = -ENOMEM;
-               goto out;
-       }
        yaffs_trace(YAFFS_TRACE_OS,
-               "start yaffs_write_begin index %d(%x) uptodate %d",
-               (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0);
+               "yaffs_removexattr of object %d", obj->obj_id);
 
-       /* Get fs space */
-       space_held = yaffs_hold_space(filp);
+       if (error == 0) {
+               int result;
+               dev = obj->my_dev;
+               yaffs_gross_lock(dev);
+               result = yaffs_remove_xattrib(obj, name);
+               if (result == YAFFS_OK)
+                       error = 0;
+               else if (result < 0)
+                       error = result;
+               yaffs_gross_unlock(dev);
 
-       if (!space_held) {
-               ret = -ENOSPC;
-               goto out;
        }
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_removexattr done returning %d", error);
 
-       /* Update page if required */
-
-       if (!Page_Uptodate(pg))
-               ret = yaffs_readpage_nolock(filp, pg);
+       return error;
+}
 
-       if (ret)
-               goto out;
+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);
 
-       /* Happy path return */
-       yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok");
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_listxattr of object %d", obj->obj_id);
 
-       return 0;
+       if (error == 0) {
+               dev = obj->my_dev;
+               yaffs_gross_lock(dev);
+               error = yaffs_list_xattrib(obj, buff, size);
+               yaffs_gross_unlock(dev);
 
-out:
-       yaffs_trace(YAFFS_TRACE_OS,
-               "end yaffs_write_begin fail returning %d", ret);
-       if (space_held)
-               yaffs_release_space(filp);
-       if (pg) {
-               unlock_page(pg);
-               page_cache_release(pg);
        }
-       return ret;
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_listxattr done returning %d", error);
+
+       return error;
 }
 
-#else
 
-static int yaffs_prepare_write(struct file *f, struct page *pg,
-                              unsigned offset, unsigned to)
-{
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write");
+static const struct inode_operations yaffs_file_inode_operations = {
+       .setattr = yaffs_setattr,
+       .setxattr = yaffs_setxattr,
+       .getxattr = yaffs_getxattr,
+       .listxattr = yaffs_listxattr,
+       .removexattr = yaffs_removexattr,
+};
 
-       if (!Page_Uptodate(pg))
-               return yaffs_readpage_nolock(f, pg);
-       return 0;
-}
-#endif
 
-#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-                          loff_t pos, unsigned len, unsigned copied,
-                          struct page *pg, void *fsdadata)
+static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
+                         int buflen)
 {
-       int ret = 0;
-       void *addr, *kva;
-       uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
+       unsigned char *alias;
+       int ret;
 
-       kva = kmap(pg);
-       addr = kva + offset_into_page;
+       struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
 
-       yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_write_end addr %p pos %lld n_bytes %d",
-               addr, pos, copied);
+       yaffs_gross_lock(dev);
 
-       ret = yaffs_file_write(filp, addr, copied, &pos);
+       alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
 
-       if (ret != copied) {
-               yaffs_trace(YAFFS_TRACE_OS,
-                       "yaffs_write_end not same size ret %d  copied %d",
-                       ret, copied);
-               SetPageError(pg);
-       }
+       yaffs_gross_unlock(dev);
 
-       kunmap(pg);
+       if (!alias)
+               return -ENOMEM;
 
-       yaffs_release_space(filp);
-       unlock_page(pg);
-       page_cache_release(pg);
+       ret = vfs_readlink(dentry, buffer, buflen, alias);
+       kfree(alias);
        return ret;
 }
-#else
 
-static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
-                             unsigned to)
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-       void *addr, *kva;
-
-       loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
-       int n_bytes = to - offset;
-       int n_written;
-
-       kva = kmap(pg);
-       addr = kva + offset;
+       void *ret;
+#else
+static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
+{
+       int ret
+#endif
+       unsigned char *alias;
+       int ret_int = 0;
+       struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
 
-       yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_commit_write addr %p pos %lld n_bytes %d",
-               addr, pos, n_bytes);
+       yaffs_gross_lock(dev);
 
-       n_written = yaffs_file_write(f, addr, n_bytes, &pos);
+       alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
+       yaffs_gross_unlock(dev);
 
-       if (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);
+       if (!alias) {
+               ret_int = -ENOMEM;
+               goto out;
        }
-       kunmap(pg);
-
-       yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_commit_write returning %d",
-               n_written == n_bytes ? 0 : n_written);
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+       nd_set_link(nd, alias);
+       ret = alias;
+out:
+       if (ret_int)
+               ret = ERR_PTR(ret_int);
+       return ret;
+#else
+       ret = vfs_follow_link(nd, alias);
+       kfree(alias);
+out:
+       if (ret_int)
+               ret = ret_int;
+       return ret;
+#endif
+}
+
+
+#ifdef YAFFS_HAS_PUT_INODE
+
+/* For now put inode is just for debugging
+ * Put inode is called when the inode **structure** is put.
+ */
+static void yaffs_put_inode(struct inode *inode)
+{
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_put_inode: ino %d, count %d"),
+               (int)inode->i_ino, atomic_read(&inode->i_count);
 
-       return n_written == n_bytes ? 0 : n_written;
 }
 #endif
 
-static void yaffs_fill_inode_from_obj(struct inode *inode,
-                                     struct yaffs_obj *obj)
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias)
 {
-       if (inode && obj) {
+       kfree(alias);
+}
+#endif
 
-               /* Check mode against the variant type and attempt to repair if broken. */
-               u32 mode = obj->yst_mode;
-               switch (obj->variant_type) {
-               case YAFFS_OBJECT_TYPE_FILE:
-                       if (!S_ISREG(mode)) {
-                               obj->yst_mode &= ~S_IFMT;
-                               obj->yst_mode |= S_IFREG;
-                       }
+static const struct inode_operations yaffs_symlink_inode_operations = {
+       .readlink = yaffs_readlink,
+       .follow_link = yaffs_follow_link,
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+       .put_link = yaffs_put_link,
+#endif
+       .setattr = yaffs_setattr,
+       .setxattr = yaffs_setxattr,
+       .getxattr = yaffs_getxattr,
+       .listxattr = yaffs_listxattr,
+       .removexattr = yaffs_removexattr,
+};
 
-                       break;
-               case YAFFS_OBJECT_TYPE_SYMLINK:
-                       if (!S_ISLNK(mode)) {
-                               obj->yst_mode &= ~S_IFMT;
-                               obj->yst_mode |= S_IFLNK;
-                       }
+#ifdef YAFFS_USE_OWN_IGET
 
-                       break;
-               case YAFFS_OBJECT_TYPE_DIRECTORY:
-                       if (!S_ISDIR(mode)) {
-                               obj->yst_mode &= ~S_IFMT;
-                               obj->yst_mode |= S_IFDIR;
-                       }
+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
+{
+       struct inode *inode;
+       struct yaffs_obj *obj;
+       struct yaffs_dev *dev = yaffs_super_to_dev(sb);
 
-                       break;
-               case YAFFS_OBJECT_TYPE_UNKNOWN:
-               case YAFFS_OBJECT_TYPE_HARDLINK:
-               case YAFFS_OBJECT_TYPE_SPECIAL:
-               default:
-                       /* TODO? */
-                       break;
-               }
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino);
 
-               inode->i_flags |= S_NOATIME;
+       inode = iget_locked(sb, ino);
+       if (!inode)
+               return ERR_PTR(-ENOMEM);
+       if (!(inode->i_state & I_NEW))
+               return inode;
 
-               inode->i_ino = obj->obj_id;
-               inode->i_mode = obj->yst_mode;
-               inode->i_uid = obj->yst_uid;
-               inode->i_gid = obj->yst_gid;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
-               inode->i_blksize = inode->i_sb->s_blocksize;
-#endif
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+       /* NB This is called as a side effect of other functions, but
+        * we had to release the lock to prevent deadlocks, so
+        * need to lock again.
+        */
 
-               inode->i_rdev = old_decode_dev(obj->yst_rdev);
-               inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-               inode->i_atime.tv_nsec = 0;
-               inode->i_mtime.tv_sec = (time_t) obj->yst_mtime;
-               inode->i_mtime.tv_nsec = 0;
-               inode->i_ctime.tv_sec = (time_t) obj->yst_ctime;
-               inode->i_ctime.tv_nsec = 0;
-#else
-               inode->i_rdev = obj->yst_rdev;
-               inode->i_atime = obj->yst_atime;
-               inode->i_mtime = obj->yst_mtime;
-               inode->i_ctime = obj->yst_ctime;
-#endif
-               inode->i_size = yaffs_get_obj_length(obj);
-               inode->i_blocks = (inode->i_size + 511) >> 9;
+       yaffs_gross_lock(dev);
 
-               set_nlink(inode, yaffs_get_obj_link_count(obj));
+       obj = yaffs_find_by_number(dev, inode->i_ino);
 
-               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));
+       yaffs_fill_inode_from_obj(inode, obj);
+
+       yaffs_gross_unlock(dev);
+
+       unlock_new_inode(inode);
+       return inode;
+}
 
-               switch (obj->yst_mode & S_IFMT) {
-               default:        /* fifo, device or socket */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-                       init_special_inode(inode, obj->yst_mode,
-                                          old_decode_dev(obj->yst_rdev));
 #else
-                       init_special_inode(inode, obj->yst_mode,
-                                          (dev_t) (obj->yst_rdev));
-#endif
-                       break;
-               case S_IFREG:   /* file */
-                       inode->i_op = &yaffs_file_inode_operations;
-                       inode->i_fop = &yaffs_file_operations;
-                       inode->i_mapping->a_ops =
-                           &yaffs_file_address_operations;
-                       break;
-               case S_IFDIR:   /* directory */
-                       inode->i_op = &yaffs_dir_inode_operations;
-                       inode->i_fop = &yaffs_dir_operations;
-                       break;
-               case S_IFLNK:   /* symlink */
-                       inode->i_op = &yaffs_symlink_inode_operations;
-                       break;
-               }
 
-               yaffs_inode_to_obj_lv(inode) = obj;
+static void yaffs_read_inode(struct inode *inode)
+{
+       /* NB This is called as a side effect of other functions, but
+        * we had to release the lock to prevent deadlocks, so
+        * need to lock again.
+        */
 
-               obj->my_inode = inode;
+       struct yaffs_obj *obj;
+       struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb);
 
-       } else {
-               yaffs_trace(YAFFS_TRACE_OS,
-                       "yaffs_fill_inode invalid parameters");
-       }
+       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);
+
+       obj = yaffs_find_by_number(dev, inode->i_ino);
+
+       yaffs_fill_inode_from_obj(inode, obj);
 
+       if (current != yaffs_dev_to_lc(dev)->readdir_process)
+               yaffs_gross_unlock(dev);
 }
 
+#endif
+
+
+
 struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
                              struct yaffs_obj *obj)
 {
@@ -1404,256 +1187,55 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
        return inode;
 }
 
-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;
-       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;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+#define YCRED(x) x
+#else
+#define YCRED(x) (x->cred)
+#endif
 
-       yaffs_gross_lock(dev);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
+                      dev_t rdev)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
+                      dev_t rdev)
+#else
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
+                      int rdev)
+#endif
+{
+       struct inode *inode;
 
-       inode = f->f_dentry->d_inode;
+       struct yaffs_obj *obj = NULL;
+       struct yaffs_dev *dev;
 
-       if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
-               ipos = inode->i_size;
-       else
-               ipos = *pos;
+       struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
 
-       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);
+       int error = -ENOSPC;
+       uid_t uid = YCRED(current)->fsuid;
+       gid_t gid =
+           (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
 
-       n_written = yaffs_wr_file(obj, buf, ipos, n, 0);
+       if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
+               mode |= S_ISGID;
 
-       yaffs_touch_super(dev);
+       if (parent) {
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_mknod: parent object %d type %d",
+                       parent->obj_id, parent->variant_type);
+       } else {
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_mknod: could not get parent object");
+               return -EPERM;
+       }
 
        yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_file_write: %d(%x) bytes written",
-               (unsigned)n, (unsigned)n);
+               "yaffs_mknod: making oject for %s, mode %x dev %x",
+               dentry->d_name.name, mode, rdev);
 
-       if (n_written > 0) {
-               ipos += n_written;
-               *pos = ipos;
-               if (ipos > inode->i_size) {
-                       inode->i_size = ipos;
-                       inode->i_blocks = (ipos + 511) >> 9;
-
-                       yaffs_trace(YAFFS_TRACE_OS,
-                               "yaffs_file_write size updated to %lld bytes, %d blocks",
-                               ipos, (int)(inode->i_blocks));
-               }
-
-       }
-       yaffs_gross_unlock(dev);
-       return (n_written == 0) && (n > 0) ? -ENOSPC : n_written;
-}
-
-/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-/* For now we just assume few parallel writes and check against a small number. */
-/* Todo: need to do this with a counter to handle parallel reads better */
-
-static ssize_t yaffs_hold_space(struct file *f)
-{
-       struct yaffs_obj *obj;
-       struct yaffs_dev *dev;
-
-       int n_free_chunks;
-
-       obj = yaffs_dentry_to_obj(f->f_dentry);
-
-       dev = obj->my_dev;
-
-       yaffs_gross_lock(dev);
-
-       n_free_chunks = yaffs_get_n_free_chunks(dev);
-
-       yaffs_gross_unlock(dev);
-
-       return (n_free_chunks > 20) ? 1 : 0;
-}
-
-static void yaffs_release_space(struct file *f)
-{
-       struct yaffs_obj *obj;
-       struct yaffs_dev *dev;
-
-       obj = yaffs_dentry_to_obj(f->f_dentry);
-
-       dev = obj->my_dev;
-
-       yaffs_gross_lock(dev);
-
-       yaffs_gross_unlock(dev);
-}
-
-static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
-{
-       struct yaffs_obj *obj;
-       struct yaffs_dev *dev;
-       struct yaffs_search_context *sc;
-       struct inode *inode = f->f_dentry->d_inode;
-       unsigned long offset, curoffs;
-       struct yaffs_obj *l;
-       int ret_val = 0;
-
-       char name[YAFFS_MAX_NAME_LENGTH + 1];
-
-       obj = yaffs_dentry_to_obj(f->f_dentry);
-       dev = obj->my_dev;
-
-       yaffs_gross_lock(dev);
-
-       yaffs_dev_to_lc(dev)->readdir_process = current;
-
-       offset = f->f_pos;
-
-       sc = yaffs_new_search(obj);
-       if (!sc) {
-               ret_val = -ENOMEM;
-               goto out;
-       }
-
-       yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_readdir: starting at %d", (int)offset);
-
-       if (offset == 0) {
-               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);
-                       goto out;
-               }
-               yaffs_gross_lock(dev);
-               offset++;
-               f->f_pos++;
-       }
-       if (offset == 1) {
-               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,
-                           DT_DIR) < 0) {
-                       yaffs_gross_lock(dev);
-                       goto out;
-               }
-               yaffs_gross_lock(dev);
-               offset++;
-               f->f_pos++;
-       }
-
-       curoffs = 1;
-
-       /* 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;
-               f->f_version = inode->i_version;
-       }
-
-       while (sc->next_return) {
-               curoffs++;
-               l = sc->next_return;
-               if (curoffs >= offset) {
-                       int this_inode = yaffs_get_obj_inode(l);
-                       int this_type = yaffs_get_obj_type(l);
-
-                       yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
-                       yaffs_trace(YAFFS_TRACE_OS,
-                               "yaffs_readdir: %s inode %d",
-                               name, yaffs_get_obj_inode(l));
-
-                       yaffs_gross_unlock(dev);
-
-                       if (filldir(dirent,
-                                   name,
-                                   strlen(name),
-                                   offset, this_inode, this_type) < 0) {
-                               yaffs_gross_lock(dev);
-                               goto out;
-                       }
-
-                       yaffs_gross_lock(dev);
-
-                       offset++;
-                       f->f_pos++;
-               }
-               yaffs_search_advance(sc);
-       }
-
-out:
-       yaffs_search_end(sc);
-       yaffs_dev_to_lc(dev)->readdir_process = NULL;
-       yaffs_gross_unlock(dev);
-
-       return ret_val;
-}
-
-/*
- * File creation. Allocate an inode, and we're done..
- */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-#define YCRED(x) x
-#else
-#define YCRED(x) (x->cred)
-#endif
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-                      dev_t rdev)
-#else
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-                      int rdev)
-#endif
-{
-       struct inode *inode;
-
-       struct yaffs_obj *obj = NULL;
-       struct yaffs_dev *dev;
-
-       struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
-
-       int error = -ENOSPC;
-       uid_t uid = YCRED(current)->fsuid;
-       gid_t gid =
-           (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
-
-       if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-               mode |= S_ISGID;
-
-       if (parent) {
-               yaffs_trace(YAFFS_TRACE_OS,
-                       "yaffs_mknod: parent object %d type %d",
-                       parent->obj_id, parent->variant_type);
-       } else {
-               yaffs_trace(YAFFS_TRACE_OS,
-                       "yaffs_mknod: could not get parent object");
-               return -EPERM;
-       }
-
-       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;
+       dev = parent->my_dev;
 
        yaffs_gross_lock(dev);
 
@@ -1707,7 +1289,11 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
        return error;
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+#else
 static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+#endif
 {
        int ret_val;
        yaffs_trace(YAFFS_TRACE_OS, "yaffs_mkdir");
@@ -1715,7 +1301,11 @@ static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        return ret_val;
 }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+                       struct nameidata *n)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
 static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
                        struct nameidata *n)
 #else
@@ -1726,35 +1316,52 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
        return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
 }
 
-static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
-{
-       int ret_val;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
 
-       struct yaffs_dev *dev;
+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
+                                  struct nameidata *n)
+#else
+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
+#endif
+{
        struct yaffs_obj *obj;
+       struct inode *inode = NULL;     /* NCB 2.5/2.6 needs NULL here */
 
-       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;
+       struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev;
 
-       yaffs_gross_lock(dev);
+       if (current != yaffs_dev_to_lc(dev)->readdir_process)
+               yaffs_gross_lock(dev);
 
-       ret_val = yaffs_unlinker(obj, 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);
 
-       if (ret_val == YAFFS_OK) {
-               inode_dec_link_count(dentry->d_inode);
-               dir->i_version++;
+       obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name);
+
+       obj = yaffs_get_equivalent_obj(obj);    /* in case it was a hardlink */
+
+       /* Can't hold gross lock when calling yaffs_get_inode() */
+       if (current != yaffs_dev_to_lc(dev)->readdir_process)
                yaffs_gross_unlock(dev);
-               update_dir_time(dir);
-               return 0;
+
+       if (obj) {
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_lookup found %d", obj->obj_id);
+
+               inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
+       } else {
+               yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found");
+
        }
-       yaffs_gross_unlock(dev);
-       return -ENOTEMPTY;
-}
 
-/*
- * Create a link...
+/* added NCB for 2.5/6 compatability - forces add even if inode is
+ * NULL which creates dentry hash */
+       d_add(dentry, inode);
+
+       return NULL;
+}
+
+/*
+ * Create a link...
  */
 static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
                      struct dentry *dentry)
@@ -1836,236 +1443,873 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
        return -ENOMEM;
 }
 
-#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,
-                            int datasync)
-#endif
+/*
+ * The VFS layer already does all the dentry stuff for rename.
+ *
+ * NB: POSIX says you can rename an object over an old object of the same name
+ */
+static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
+                       struct inode *new_dir, struct dentry *new_dentry)
+{
+       struct yaffs_dev *dev;
+       int ret_val = YAFFS_FAIL;
+       struct yaffs_obj *target;
+
+       yaffs_trace(YAFFS_TRACE_OS, "yaffs_rename");
+       dev = yaffs_inode_to_obj(old_dir)->my_dev;
+
+       yaffs_gross_lock(dev);
+
+       /* Check if the target is an existing directory that is not empty. */
+       target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir),
+                                   new_dentry->d_name.name);
+
+       if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
+           !list_empty(&target->variant.dir_variant.children)) {
+
+               yaffs_trace(YAFFS_TRACE_OS, "target is non-empty dir");
+
+               ret_val = YAFFS_FAIL;
+       } else {
+               /* Now does unlinking internally using shadowing mechanism */
+               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,
+                                          yaffs_inode_to_obj(new_dir),
+                                          new_dentry->d_name.name);
+       }
+       yaffs_gross_unlock(dev);
+
+       if (ret_val == YAFFS_OK) {
+               if (target)
+                       inode_dec_link_count(new_dentry->d_inode);
+
+               update_dir_time(old_dir);
+               if (old_dir != new_dir)
+                       update_dir_time(new_dir);
+               return 0;
+       } else {
+               return -ENOTEMPTY;
+       }
+}
+
+
+
+
+static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
+{
+       int ret_val;
+
+       struct yaffs_dev *dev;
+       struct yaffs_obj *obj;
+
+       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;
+
+       yaffs_gross_lock(dev);
+
+       ret_val = yaffs_unlinker(obj, dentry->d_name.name);
+
+       if (ret_val == YAFFS_OK) {
+               inode_dec_link_count(dentry->d_inode);
+               dir->i_version++;
+               yaffs_gross_unlock(dev);
+               update_dir_time(dir);
+               return 0;
+       }
+       yaffs_gross_unlock(dev);
+       return -ENOTEMPTY;
+}
+
+
+
+static const struct inode_operations yaffs_dir_inode_operations = {
+       .create = yaffs_create,
+       .lookup = yaffs_lookup,
+       .link = yaffs_link,
+       .unlink = yaffs_unlink,
+       .symlink = yaffs_symlink,
+       .mkdir = yaffs_mkdir,
+       .rmdir = yaffs_unlink,
+       .mknod = yaffs_mknod,
+       .rename = yaffs_rename,
+       .setattr = yaffs_setattr,
+       .setxattr = yaffs_setxattr,
+       .getxattr = yaffs_getxattr,
+       .listxattr = yaffs_listxattr,
+       .removexattr = yaffs_removexattr,
+};
+
+/*-----------------------------------------------------------------*/
+/* Directory search context allows us to unlock access to yaffs during
+ * filldir without causing problems with the directory being modified.
+ * This is similar to the tried and tested mechanism used in yaffs direct.
+ *
+ * A search context iterates along a doubly linked list of siblings in the
+ * directory. If the iterating object is deleted then this would corrupt
+ * the list iteration, likely causing a crash. The search context avoids
+ * this by using the remove_obj_fn to move the search context to the
+ * next object before the object is deleted.
+ *
+ * Many readdirs (and thus seach conexts) may be alive simulateously so
+ * each struct yaffs_dev has a list of these.
+ *
+ * A seach context lives for the duration of a readdir.
+ *
+ * All these functions must be called while yaffs is locked.
+ */
+
+struct yaffs_search_context {
+       struct yaffs_dev *dev;
+       struct yaffs_obj *dir_obj;
+       struct yaffs_obj *next_return;
+       struct list_head others;
+};
+
+/*
+ * yaffs_new_search() creates a new search context, initialises it and
+ * adds it to the device's search context list.
+ *
+ * Called at start of readdir.
+ */
+static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir)
+{
+       struct yaffs_dev *dev = dir->my_dev;
+       struct yaffs_search_context *sc =
+           kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS);
+       if (sc) {
+               sc->dir_obj = dir;
+               sc->dev = dev;
+               if (list_empty(&sc->dir_obj->variant.dir_variant.children))
+                       sc->next_return = NULL;
+               else
+                       sc->next_return =
+                           list_entry(dir->variant.dir_variant.children.next,
+                                      struct yaffs_obj, siblings);
+               INIT_LIST_HEAD(&sc->others);
+               list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts));
+       }
+       return sc;
+}
+
+/*
+ * yaffs_search_end() disposes of a search context and cleans up.
+ */
+static void yaffs_search_end(struct yaffs_search_context *sc)
+{
+       if (sc) {
+               list_del(&sc->others);
+               kfree(sc);
+       }
+}
+
+/*
+ * yaffs_search_advance() moves a search context to the next object.
+ * Called when the search iterates or when an object removal causes
+ * the search context to be moved to the next object.
+ */
+static void yaffs_search_advance(struct yaffs_search_context *sc)
+{
+       if (!sc)
+               return;
+
+       if (sc->next_return == NULL ||
+           list_empty(&sc->dir_obj->variant.dir_variant.children))
+               sc->next_return = NULL;
+       else {
+               struct list_head *next = sc->next_return->siblings.next;
+
+               if (next == &sc->dir_obj->variant.dir_variant.children)
+                       sc->next_return = NULL; /* end of list */
+               else
+                       sc->next_return =
+                           list_entry(next, struct yaffs_obj, siblings);
+       }
+}
+
+/*
+ * yaffs_remove_obj_callback() is called when an object is unlinked.
+ * We check open search contexts and advance any which are currently
+ * on the object being iterated.
+ */
+static void yaffs_remove_obj_callback(struct yaffs_obj *obj)
 {
 
+       struct list_head *i;
+       struct yaffs_search_context *sc;
+       struct list_head *search_contexts =
+           &(yaffs_dev_to_lc(obj->my_dev)->search_contexts);
+
+       /* Iterate through the directory search contexts.
+        * If any are currently on the object being removed, then advance
+        * the search context to the next object to prevent a hanging pointer.
+        */
+       list_for_each(i, search_contexts) {
+               sc = list_entry(i, struct yaffs_search_context, others);
+               if (sc->next_return == obj)
+                       yaffs_search_advance(sc);
+       }
+
+}
+
+
+/*-----------------------------------------------------------------*/
+
+static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
+{
        struct yaffs_obj *obj;
        struct yaffs_dev *dev;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
-       struct dentry *dentry = file->f_path.dentry;
-#endif
+       struct yaffs_search_context *sc;
+       struct inode *inode = f->f_dentry->d_inode;
+       unsigned long offset, curoffs;
+       struct yaffs_obj *l;
+       int ret_val = 0;
 
-       obj = yaffs_dentry_to_obj(dentry);
+       char name[YAFFS_MAX_NAME_LENGTH + 1];
 
+       obj = yaffs_dentry_to_obj(f->f_dentry);
        dev = obj->my_dev;
 
-       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);
-       return 0;
+
+       yaffs_dev_to_lc(dev)->readdir_process = current;
+
+       offset = f->f_pos;
+
+       sc = yaffs_new_search(obj);
+       if (!sc) {
+               ret_val = -ENOMEM;
+               goto out;
+       }
+
+       yaffs_trace(YAFFS_TRACE_OS,
+               "yaffs_readdir: starting at %d", (int)offset);
+
+       if (offset == 0) {
+               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);
+                       goto out;
+               }
+               yaffs_gross_lock(dev);
+               offset++;
+               f->f_pos++;
+       }
+       if (offset == 1) {
+               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,
+                           DT_DIR) < 0) {
+                       yaffs_gross_lock(dev);
+                       goto out;
+               }
+               yaffs_gross_lock(dev);
+               offset++;
+               f->f_pos++;
+       }
+
+       curoffs = 1;
+
+       /* 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;
+               f->f_version = inode->i_version;
+       }
+
+       while (sc->next_return) {
+               curoffs++;
+               l = sc->next_return;
+               if (curoffs >= offset) {
+                       int this_inode = yaffs_get_obj_inode(l);
+                       int this_type = yaffs_get_obj_type(l);
+
+                       yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
+                       yaffs_trace(YAFFS_TRACE_OS,
+                               "yaffs_readdir: %s inode %d",
+                               name, yaffs_get_obj_inode(l));
+
+                       yaffs_gross_unlock(dev);
+
+                       if (filldir(dirent,
+                                   name,
+                                   strlen(name),
+                                   offset, this_inode, this_type) < 0) {
+                               yaffs_gross_lock(dev);
+                               goto out;
+                       }
+
+                       yaffs_gross_lock(dev);
+
+                       offset++;
+                       f->f_pos++;
+               }
+               yaffs_search_advance(sc);
+       }
+
+out:
+       yaffs_search_end(sc);
+       yaffs_dev_to_lc(dev)->readdir_process = NULL;
+       yaffs_gross_unlock(dev);
+
+       return ret_val;
+}
+
+static const struct file_operations yaffs_dir_operations = {
+       .read = generic_read_dir,
+       .readdir = yaffs_readdir,
+       .fsync = yaffs_sync_object,
+       .llseek = generic_file_llseek,
+};
+
+static void yaffs_fill_inode_from_obj(struct inode *inode,
+                                     struct yaffs_obj *obj)
+{
+       if (inode && obj) {
+
+               /* Check mode against the variant type and attempt to repair if broken. */
+               u32 mode = obj->yst_mode;
+               switch (obj->variant_type) {
+               case YAFFS_OBJECT_TYPE_FILE:
+                       if (!S_ISREG(mode)) {
+                               obj->yst_mode &= ~S_IFMT;
+                               obj->yst_mode |= S_IFREG;
+                       }
+
+                       break;
+               case YAFFS_OBJECT_TYPE_SYMLINK:
+                       if (!S_ISLNK(mode)) {
+                               obj->yst_mode &= ~S_IFMT;
+                               obj->yst_mode |= S_IFLNK;
+                       }
+
+                       break;
+               case YAFFS_OBJECT_TYPE_DIRECTORY:
+                       if (!S_ISDIR(mode)) {
+                               obj->yst_mode &= ~S_IFMT;
+                               obj->yst_mode |= S_IFDIR;
+                       }
+
+                       break;
+               case YAFFS_OBJECT_TYPE_UNKNOWN:
+               case YAFFS_OBJECT_TYPE_HARDLINK:
+               case YAFFS_OBJECT_TYPE_SPECIAL:
+               default:
+                       /* TODO? */
+                       break;
+               }
+
+               inode->i_flags |= S_NOATIME;
+
+               inode->i_ino = obj->obj_id;
+               inode->i_mode = obj->yst_mode;
+               inode->i_uid = obj->yst_uid;
+               inode->i_gid = obj->yst_gid;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+               inode->i_blksize = inode->i_sb->s_blocksize;
+#endif
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+
+               inode->i_rdev = old_decode_dev(obj->yst_rdev);
+               inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
+               inode->i_atime.tv_nsec = 0;
+               inode->i_mtime.tv_sec = (time_t) obj->yst_mtime;
+               inode->i_mtime.tv_nsec = 0;
+               inode->i_ctime.tv_sec = (time_t) obj->yst_ctime;
+               inode->i_ctime.tv_nsec = 0;
+#else
+               inode->i_rdev = obj->yst_rdev;
+               inode->i_atime = obj->yst_atime;
+               inode->i_mtime = obj->yst_mtime;
+               inode->i_ctime = obj->yst_ctime;
+#endif
+               inode->i_size = yaffs_get_obj_length(obj);
+               inode->i_blocks = (inode->i_size + 511) >> 9;
+
+               set_nlink(inode, yaffs_get_obj_link_count(obj));
+
+               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 */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+                       init_special_inode(inode, obj->yst_mode,
+                                          old_decode_dev(obj->yst_rdev));
+#else
+                       init_special_inode(inode, obj->yst_mode,
+                                          (dev_t) (obj->yst_rdev));
+#endif
+                       break;
+               case S_IFREG:   /* file */
+                       inode->i_op = &yaffs_file_inode_operations;
+                       inode->i_fop = &yaffs_file_operations;
+                       inode->i_mapping->a_ops =
+                           &yaffs_file_address_operations;
+                       break;
+               case S_IFDIR:   /* directory */
+                       inode->i_op = &yaffs_dir_inode_operations;
+                       inode->i_fop = &yaffs_dir_operations;
+                       break;
+               case S_IFLNK:   /* symlink */
+                       inode->i_op = &yaffs_symlink_inode_operations;
+                       break;
+               }
+
+               yaffs_inode_to_obj_lv(inode) = obj;
+
+               obj->my_inode = inode;
+
+       } else {
+               yaffs_trace(YAFFS_TRACE_OS,
+                       "yaffs_fill_inode invalid parameters");
+       }
+
+}
+
+
+
+/*
+ * yaffs background thread functions .
+ * yaffs_bg_thread_fn() the thread function
+ * yaffs_bg_start() launches the background thread.
+ * yaffs_bg_stop() 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.
+ */
+
+static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev)
+{
+       unsigned erased_chunks =
+           dev->n_erased_blocks * dev->param.chunks_per_block;
+       struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+       unsigned scattered = 0; /* Free chunks not in an erased block */
+
+       if (erased_chunks < dev->n_free_chunks)
+               scattered = (dev->n_free_chunks - erased_chunks);
+
+       if (!context->bg_running)
+               return 0;
+       else if (scattered < (dev->param.chunks_per_block * 2))
+               return 0;
+       else if (erased_chunks > dev->n_free_chunks / 2)
+               return 0;
+       else if (erased_chunks > dev->n_free_chunks / 4)
+               return 1;
+       else
+               return 2;
+}
+
+#ifdef YAFFS_COMPILE_BACKGROUND
+
+void yaffs_background_waker(unsigned long data)
+{
+       wake_up_process((struct task_struct *)data);
+}
+
+static int yaffs_bg_thread_fn(void *data)
+{
+       struct yaffs_dev *dev = (struct yaffs_dev *)data;
+       struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+       unsigned long now = jiffies;
+       unsigned long next_dir_update = now;
+       unsigned long next_gc = now;
+       unsigned long expires;
+       unsigned int urgency;
+
+       int gc_result;
+       struct timer_list timer;
+
+       yaffs_trace(YAFFS_TRACE_BACKGROUND,
+               "yaffs_background starting for dev %p", (void *)dev);
+
+#ifdef YAFFS_COMPILE_FREEZER
+       set_freezable();
+#endif
+       while (context->bg_running) {
+               yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background");
+
+               if (kthread_should_stop())
+                       break;
+
+#ifdef YAFFS_COMPILE_FREEZER
+               if (try_to_freeze())
+                       continue;
+#endif
+               yaffs_gross_lock(dev);
+
+               now = jiffies;
+
+               if (time_after(now, next_dir_update) && yaffs_bg_enable) {
+                       yaffs_update_dirty_dirs(dev);
+                       next_dir_update = now + HZ;
+               }
+
+               if (time_after(now, next_gc) && yaffs_bg_enable) {
+                       if (!dev->is_checkpointed) {
+                               urgency = yaffs_bg_gc_urgency(dev);
+                               gc_result = yaffs_bg_gc(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_gross_unlock(dev);
+#if 1
+               expires = next_dir_update;
+               if (time_before(next_gc, expires))
+                       expires = next_gc;
+               if (time_before(expires, now))
+                       expires = now + HZ;
+
+               Y_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
+       }
+
+       return 0;
+}
+
+static int yaffs_bg_start(struct yaffs_dev *dev)
+{
+       int retval = 0;
+       struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+
+       if (dev->read_only)
+               return -1;
+
+       context->bg_running = 1;
+
+       context->bg_thread = kthread_run(yaffs_bg_thread_fn,
+                                        (void *)dev, "yaffs-bg-%d",
+                                        context->mount_id);
+
+       if (IS_ERR(context->bg_thread)) {
+               retval = PTR_ERR(context->bg_thread);
+               context->bg_thread = NULL;
+               context->bg_running = 0;
+       }
+       return retval;
+}
+
+static void yaffs_bg_stop(struct yaffs_dev *dev)
+{
+       struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev);
+
+       ctxt->bg_running = 0;
+
+       if (ctxt->bg_thread) {
+               kthread_stop(ctxt->bg_thread);
+               ctxt->bg_thread = NULL;
+       }
+}
+#else
+static int yaffs_bg_thread_fn(void *data)
+{
+       return 0;
+}
+
+static int yaffs_bg_start(struct yaffs_dev *dev)
+{
+       return 0;
+}
+
+static void yaffs_bg_stop(struct yaffs_dev *dev)
+{
+}
+#endif
+
+
+static void yaffs_flush_inodes(struct super_block *sb)
+{
+       struct inode *iptr;
+       struct yaffs_obj *obj;
+
+       list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) {
+               obj = yaffs_inode_to_obj(iptr);
+               if (obj) {
+                       yaffs_trace(YAFFS_TRACE_OS,
+                               "flushing obj %d",
+                               obj->obj_id);
+                       yaffs_flush_file(obj, 1, 0);
+               }
+       }
+}
+
+static void yaffs_flush_super(struct super_block *sb, int do_checkpoint)
+{
+       struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+       if (!dev)
+               return;
+
+       yaffs_flush_inodes(sb);
+       yaffs_update_dirty_dirs(dev);
+       yaffs_flush_whole_cache(dev);
+       if (do_checkpoint)
+               yaffs_checkpoint_save(dev);
 }
 
-/*
- * The VFS layer already does all the dentry stuff for rename.
- *
- * NB: POSIX says you can rename an object over an old object of the same name
- */
-static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
-                       struct inode *new_dir, struct dentry *new_dentry)
+static LIST_HEAD(yaffs_context_list);
+struct mutex yaffs_context_lock;
+
+static void yaffs_put_super(struct super_block *sb)
 {
-       struct yaffs_dev *dev;
-       int ret_val = YAFFS_FAIL;
-       struct yaffs_obj *target;
+       struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+       struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
 
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_rename");
-       dev = yaffs_inode_to_obj(old_dir)->my_dev;
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
+                       "yaffs_put_super");
+
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+               "Shutting down yaffs background thread");
+       yaffs_bg_stop(dev);
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+               "yaffs background thread shut down");
 
        yaffs_gross_lock(dev);
 
-       /* Check if the target is an existing directory that is not empty. */
-       target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir),
-                                   new_dentry->d_name.name);
+       yaffs_flush_super(sb, 1);
 
-       if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
-           !list_empty(&target->variant.dir_variant.children)) {
+       yaffs_deinitialise(dev);
 
-               yaffs_trace(YAFFS_TRACE_OS, "target is non-empty dir");
+       yaffs_gross_unlock(dev);
 
-               ret_val = YAFFS_FAIL;
-       } else {
-               /* Now does unlinking internally using shadowing mechanism */
-               yaffs_trace(YAFFS_TRACE_OS, "calling yaffs_rename_obj");
+       mutex_lock(&yaffs_context_lock);
+       list_del_init(&(yaffs_dev_to_lc(dev)->context_list));
+       mutex_unlock(&yaffs_context_lock);
 
-               ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir),
-                                          old_dentry->d_name.name,
-                                          yaffs_inode_to_obj(new_dir),
-                                          new_dentry->d_name.name);
+       if (yaffs_dev_to_lc(dev)->spare_buffer) {
+               kfree(yaffs_dev_to_lc(dev)->spare_buffer);
+               yaffs_dev_to_lc(dev)->spare_buffer = NULL;
        }
-       yaffs_gross_unlock(dev);
 
-       if (ret_val == YAFFS_OK) {
-               if (target)
-                       inode_dec_link_count(new_dentry->d_inode);
+       kfree(dev);
 
-               update_dir_time(old_dir);
-               if (old_dir != new_dir)
-                       update_dir_time(new_dir);
-               return 0;
-       } else {
-               return -ENOTEMPTY;
-       }
+       yaffs_put_mtd_device(mtd);
+
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
+                       "yaffs_put_super done");
 }
 
-static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
+
+static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev)
 {
-       struct inode *inode = dentry->d_inode;
-       int error = 0;
-       struct yaffs_dev *dev;
+       return yaffs_gc_control;
+}
 
-       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);
-       if (error == 0) {
-               int result;
-               if (!error) {
-                       error = yaffs_vfs_setattr(inode, attr);
-                       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;
-                       }
-               }
-               dev = yaffs_inode_to_obj(inode)->my_dev;
-               if (attr->ia_valid & ATTR_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);
-               if (result == YAFFS_OK) {
-                       error = 0;
-               } else {
-                       error = -EPERM;
-               }
-               yaffs_gross_unlock(dev);
+#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);
+}
 
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error);
+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);
+}
 
-       return error;
+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);
 }
 
-static int yaffs_setxattr(struct dentry *dentry, const char *name,
-                  const void *value, size_t size, int flags)
+struct dentry *yaffs2_get_parent(struct dentry *dentry)
 {
-       struct inode *inode = dentry->d_inode;
-       int error = 0;
-       struct yaffs_dev *dev;
-       struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id);
+       struct super_block *sb = dentry->d_inode->i_sb;
+       struct dentry *parent = ERR_PTR(-ENOENT);
+       struct inode *inode;
+       unsigned long parent_ino;
+       struct yaffs_obj *d_obj;
+       struct yaffs_obj *parent_obj;
 
-       if (error == 0) {
-               int result;
-               dev = obj->my_dev;
-               yaffs_gross_lock(dev);
-               result = yaffs_set_xattrib(obj, name, value, size, flags);
-               if (result == YAFFS_OK)
-                       error = 0;
-               else if (result < 0)
-                       error = result;
-               yaffs_gross_unlock(dev);
+       d_obj = yaffs_inode_to_obj(dentry->d_inode);
+
+       if (d_obj) {
+               parent_obj = d_obj->parent;
+               if (parent_obj) {
+                       parent_ino = yaffs_get_obj_inode(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);
+                               }
+                       }
+               }
        }
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error);
 
-       return error;
+       return parent;
 }
 
-static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name,
-                       void *buff, size_t size)
+/* Just declare a zero structure as a NULL value implies
+ * using the default functions of exportfs.
+ */
+
+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
+
+static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj)
 {
-       struct inode *inode = dentry->d_inode;
-       int error = 0;
+       /* Clear the association between the inode and
+        * the struct yaffs_obj.
+        */
+       obj->my_inode = NULL;
+       yaffs_inode_to_obj_lv(inode) = NULL;
+
+       /* If the object freeing was deferred, then the real
+        * free happens now.
+        * This should fix the inode inconsistency problem.
+        */
+       yaffs_handle_defered_free(obj);
+}
+
+#ifdef YAFFS_HAS_EVICT_INODE
+/* yaffs_evict_inode combines into one operation what was previously done in
+ * yaffs_clear_inode() and yaffs_delete_inode()
+ *
+ */
+static void yaffs_evict_inode(struct inode *inode)
+{
+       struct yaffs_obj *obj;
        struct yaffs_dev *dev;
-       struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+       int deleteme = 0;
+
+       obj = yaffs_inode_to_obj(inode);
 
        yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_getxattr \"%s\" from object %d",
-               name, obj->obj_id);
+               "yaffs_evict_inode: ino %d, count %d %s",
+               (int)inode->i_ino, atomic_read(&inode->i_count),
+               obj ? "object exists" : "null object");
 
-       if (error == 0) {
+       if (!inode->i_nlink && !is_bad_inode(inode))
+               deleteme = 1;
+       truncate_inode_pages(&inode->i_data, 0);
+       Y_CLEAR_INODE(inode);
+
+       if (deleteme && obj) {
                dev = obj->my_dev;
                yaffs_gross_lock(dev);
-               error = yaffs_get_xattrib(obj, name, buff, size);
+               yaffs_del_obj(obj);
+               yaffs_gross_unlock(dev);
+       }
+       if (obj) {
+               dev = obj->my_dev;
+               yaffs_gross_lock(dev);
+               yaffs_unstitch_obj(inode, obj);
                yaffs_gross_unlock(dev);
-
        }
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error);
-
-       return error;
 }
+#else
 
-static int yaffs_removexattr(struct dentry *dentry, const char *name)
+/* clear is called to tell the fs to release any per-inode data it holds.
+ * The object might still exist on disk and is just being thrown out of the cache
+ * or else the object has actually been deleted and we're being called via
+ * the chain
+ *   yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode()
+ */
+
+static void yaffs_clear_inode(struct inode *inode)
 {
-       struct inode *inode = dentry->d_inode;
-       int error = 0;
+       struct yaffs_obj *obj;
        struct yaffs_dev *dev;
-       struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+
+       obj = yaffs_inode_to_obj(inode);
 
        yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_removexattr of object %d", obj->obj_id);
+               "yaffs_clear_inode: ino %d, count %d %s",
+               (int)inode->i_ino, atomic_read(&inode->i_count),
+               obj ? "object exists" : "null object");
 
-       if (error == 0) {
-               int result;
+       if (obj) {
                dev = obj->my_dev;
                yaffs_gross_lock(dev);
-               result = yaffs_remove_xattrib(obj, name);
-               if (result == YAFFS_OK)
-                       error = 0;
-               else if (result < 0)
-                       error = result;
+               yaffs_unstitch_obj(inode, obj);
                yaffs_gross_unlock(dev);
-
        }
-       yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_removexattr done returning %d", error);
 
-       return error;
 }
 
-static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size)
+/* delete is called when the link count is zero and the inode
+ * is put (ie. nobody wants to know about it anymore, time to
+ * delete the file).
+ * NB Must call clear_inode()
+ */
+static void yaffs_delete_inode(struct inode *inode)
 {
-       struct inode *inode = dentry->d_inode;
-       int error = 0;
-       struct yaffs_dev *dev;
        struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+       struct yaffs_dev *dev;
 
        yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_listxattr of object %d", obj->obj_id);
+               "yaffs_delete_inode: ino %d, count %d %s",
+               (int)inode->i_ino, atomic_read(&inode->i_count),
+               obj ? "object exists" : "null object");
 
-       if (error == 0) {
+       if (obj) {
                dev = obj->my_dev;
                yaffs_gross_lock(dev);
-               error = yaffs_list_xattrib(obj, buff, size);
+               yaffs_del_obj(obj);
                yaffs_gross_unlock(dev);
-
        }
-       yaffs_trace(YAFFS_TRACE_OS,
-               "yaffs_listxattr done returning %d", error);
-
-       return error;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
+       truncate_inode_pages(&inode->i_data, 0);
+#endif
+       clear_inode(inode);
 }
+#endif
+
+
 
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
@@ -2098,278 +2342,82 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
                uint64_t bytes_free;
 
                bytes_in_dev =
-                   ((uint64_t)
-                    ((dev->param.end_block - dev->param.start_block +
-                      1))) * ((uint64_t) (dev->param.chunks_per_block *
-                                          dev->data_bytes_per_chunk));
-
-               do_div(bytes_in_dev, sb->s_blocksize);  /* bytes_in_dev becomes the number of blocks */
-               buf->f_blocks = bytes_in_dev;
-
-               bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) *
-                   ((uint64_t) (dev->data_bytes_per_chunk));
-
-               do_div(bytes_free, sb->s_blocksize);
-
-               buf->f_bfree = bytes_free;
-
-       } else if (sb->s_blocksize > dev->data_bytes_per_chunk) {
-
-               buf->f_blocks =
-                   (dev->param.end_block - dev->param.start_block + 1) *
-                   dev->param.chunks_per_block /
-                   (sb->s_blocksize / dev->data_bytes_per_chunk);
-               buf->f_bfree =
-                   yaffs_get_n_free_chunks(dev) /
-                   (sb->s_blocksize / dev->data_bytes_per_chunk);
-       } else {
-               buf->f_blocks =
-                   (dev->param.end_block - dev->param.start_block + 1) *
-                   dev->param.chunks_per_block *
-                   (dev->data_bytes_per_chunk / sb->s_blocksize);
-
-               buf->f_bfree =
-                   yaffs_get_n_free_chunks(dev) *
-                   (dev->data_bytes_per_chunk / sb->s_blocksize);
-       }
-
-       buf->f_files = 0;
-       buf->f_ffree = 0;
-       buf->f_bavail = buf->f_bfree;
-
-       yaffs_gross_unlock(dev);
-       return 0;
-}
-
-static void yaffs_flush_inodes(struct super_block *sb)
-{
-       struct inode *iptr;
-       struct yaffs_obj *obj;
-
-       list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) {
-               obj = yaffs_inode_to_obj(iptr);
-               if (obj) {
-                       yaffs_trace(YAFFS_TRACE_OS,
-                               "flushing obj %d",
-                               obj->obj_id);
-                       yaffs_flush_file(obj, 1, 0);
-               }
-       }
-}
-
-static void yaffs_flush_super(struct super_block *sb, int do_checkpoint)
-{
-       struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-       if (!dev)
-               return;
-
-       yaffs_flush_inodes(sb);
-       yaffs_update_dirty_dirs(dev);
-       yaffs_flush_whole_cache(dev);
-       if (do_checkpoint)
-               yaffs_checkpoint_save(dev);
-}
-
-static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev)
-{
-       unsigned erased_chunks =
-           dev->n_erased_blocks * dev->param.chunks_per_block;
-       struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
-       unsigned scattered = 0; /* Free chunks not in an erased block */
-
-       if (erased_chunks < dev->n_free_chunks)
-               scattered = (dev->n_free_chunks - erased_chunks);
-
-       if (!context->bg_running)
-               return 0;
-       else if (scattered < (dev->param.chunks_per_block * 2))
-               return 0;
-       else if (erased_chunks > dev->n_free_chunks / 2)
-               return 0;
-       else if (erased_chunks > dev->n_free_chunks / 4)
-               return 1;
-       else
-               return 2;
-}
-
-static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint)
-{
-
-       struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-       unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4);
-       unsigned gc_urgent = yaffs_bg_gc_urgency(dev);
-       int do_checkpoint;
-
-       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) ||
-                        oneshot_checkpoint) && !dev->is_checkpointed;
-
-       if (sb->s_dirt || do_checkpoint) {
-               yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint);
-               sb->s_dirt = 0;
-               if (oneshot_checkpoint)
-                       yaffs_auto_checkpoint &= ~4;
-       }
-       yaffs_gross_unlock(dev);
-
-       return 0;
-}
-
-/*
- * yaffs background thread functions .
- * yaffs_bg_thread_fn() the thread function
- * yaffs_bg_start() launches the background thread.
- * yaffs_bg_stop() 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_bg_thread_fn(void *data)
-{
-       struct yaffs_dev *dev = (struct yaffs_dev *)data;
-       struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
-       unsigned long now = jiffies;
-       unsigned long next_dir_update = now;
-       unsigned long next_gc = now;
-       unsigned long expires;
-       unsigned int urgency;
-
-       int gc_result;
-       struct timer_list timer;
-
-       yaffs_trace(YAFFS_TRACE_BACKGROUND,
-               "yaffs_background starting for dev %p", (void *)dev);
-
-#ifdef YAFFS_COMPILE_FREEZER
-       set_freezable();
-#endif
-       while (context->bg_running) {
-               yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background");
-
-               if (kthread_should_stop())
-                       break;
-
-#ifdef YAFFS_COMPILE_FREEZER
-               if (try_to_freeze())
-                       continue;
-#endif
-               yaffs_gross_lock(dev);
-
-               now = jiffies;
-
-               if (time_after(now, next_dir_update) && yaffs_bg_enable) {
-                       yaffs_update_dirty_dirs(dev);
-                       next_dir_update = now + HZ;
-               }
-
-               if (time_after(now, next_gc) && yaffs_bg_enable) {
-                       if (!dev->is_checkpointed) {
-                               urgency = yaffs_bg_gc_urgency(dev);
-                               gc_result = yaffs_bg_gc(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_gross_unlock(dev);
-#if 1
-               expires = next_dir_update;
-               if (time_before(next_gc, expires))
-                       expires = next_gc;
-               if (time_before(expires, now))
-                       expires = now + HZ;
-
-               Y_INIT_TIMER(&timer);
-               timer.expires = expires + 1;
-               timer.data = (unsigned long)current;
-               timer.function = yaffs_background_waker;
+                   ((uint64_t)
+                    ((dev->param.end_block - dev->param.start_block +
+                      1))) * ((uint64_t) (dev->param.chunks_per_block *
+                                          dev->data_bytes_per_chunk));
 
-               set_current_state(TASK_INTERRUPTIBLE);
-               add_timer(&timer);
-               schedule();
-               del_timer_sync(&timer);
-#else
-               msleep(10);
-#endif
-       }
+               do_div(bytes_in_dev, sb->s_blocksize);  /* bytes_in_dev becomes the number of blocks */
+               buf->f_blocks = bytes_in_dev;
 
-       return 0;
-}
+               bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) *
+                   ((uint64_t) (dev->data_bytes_per_chunk));
 
-static int yaffs_bg_start(struct yaffs_dev *dev)
-{
-       int retval = 0;
-       struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+               do_div(bytes_free, sb->s_blocksize);
 
-       if (dev->read_only)
-               return -1;
+               buf->f_bfree = bytes_free;
 
-       context->bg_running = 1;
+       } else if (sb->s_blocksize > dev->data_bytes_per_chunk) {
 
-       context->bg_thread = kthread_run(yaffs_bg_thread_fn,
-                                        (void *)dev, "yaffs-bg-%d",
-                                        context->mount_id);
+               buf->f_blocks =
+                   (dev->param.end_block - dev->param.start_block + 1) *
+                   dev->param.chunks_per_block /
+                   (sb->s_blocksize / dev->data_bytes_per_chunk);
+               buf->f_bfree =
+                   yaffs_get_n_free_chunks(dev) /
+                   (sb->s_blocksize / dev->data_bytes_per_chunk);
+       } else {
+               buf->f_blocks =
+                   (dev->param.end_block - dev->param.start_block + 1) *
+                   dev->param.chunks_per_block *
+                   (dev->data_bytes_per_chunk / sb->s_blocksize);
 
-       if (IS_ERR(context->bg_thread)) {
-               retval = PTR_ERR(context->bg_thread);
-               context->bg_thread = NULL;
-               context->bg_running = 0;
+               buf->f_bfree =
+                   yaffs_get_n_free_chunks(dev) *
+                   (dev->data_bytes_per_chunk / sb->s_blocksize);
        }
-       return retval;
+
+       buf->f_files = 0;
+       buf->f_ffree = 0;
+       buf->f_bavail = buf->f_bfree;
+
+       yaffs_gross_unlock(dev);
+       return 0;
 }
 
-static void yaffs_bg_stop(struct yaffs_dev *dev)
+
+
+static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint)
 {
-       struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev);
 
-       ctxt->bg_running = 0;
+       struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+       unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4);
+       unsigned gc_urgent = yaffs_bg_gc_urgency(dev);
+       int do_checkpoint;
+       int dirty = yaffs_check_super_dirty(dev);
 
-       if (ctxt->bg_thread) {
-               kthread_stop(ctxt->bg_thread);
-               ctxt->bg_thread = NULL;
+       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
+               "yaffs_do_sync_fs: gc-urgency %d %s %s%s",
+               gc_urgent,
+               dirty ? "dirty" : "clean",
+               request_checkpoint ? "checkpoint requested" : "no checkpoint",
+               oneshot_checkpoint ? " one-shot" : "");
+
+       yaffs_gross_lock(dev);
+       do_checkpoint = ((request_checkpoint && !gc_urgent) ||
+                        oneshot_checkpoint) && !dev->is_checkpointed;
+
+       if (dirty || do_checkpoint) {
+               yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint);
+               yaffs_clear_super_dirty(dev);
+               if (oneshot_checkpoint)
+                       yaffs_auto_checkpoint &= ~4;
        }
-}
-#else
-static int yaffs_bg_thread_fn(void *data)
-{
-       return 0;
-}
+       yaffs_gross_unlock(dev);
 
-static int yaffs_bg_start(struct yaffs_dev *dev)
-{
        return 0;
 }
 
-static void yaffs_bg_stop(struct yaffs_dev *dev)
-{
-}
-#endif
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 static void yaffs_write_super(struct super_block *sb)
@@ -2406,122 +2454,27 @@ static int yaffs_sync_fs(struct super_block *sb)
        return 0;
 }
 
-#ifdef YAFFS_USE_OWN_IGET
-
-static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-{
-       struct inode *inode;
-       struct yaffs_obj *obj;
-       struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino);
-
-       inode = iget_locked(sb, ino);
-       if (!inode)
-               return ERR_PTR(-ENOMEM);
-       if (!(inode->i_state & I_NEW))
-               return inode;
-
-       /* NB This is called as a side effect of other functions, but
-        * we had to release the lock to prevent deadlocks, so
-        * need to lock again.
-        */
-
-       yaffs_gross_lock(dev);
-
-       obj = yaffs_find_by_number(dev, inode->i_ino);
-
-       yaffs_fill_inode_from_obj(inode, obj);
 
-       yaffs_gross_unlock(dev);
 
-       unlock_new_inode(inode);
-       return inode;
-}
+static const struct super_operations yaffs_super_ops = {
+       .statfs = yaffs_statfs,
 
+#ifndef YAFFS_USE_OWN_IGET
+       .read_inode = yaffs_read_inode,
+#endif
+#ifdef YAFFS_HAS_PUT_INODE
+       .put_inode = yaffs_put_inode,
+#endif
+       .put_super = yaffs_put_super,
+#ifdef YAFFS_HAS_EVICT_INODE
+       .evict_inode = yaffs_evict_inode,
 #else
-
-static void yaffs_read_inode(struct inode *inode)
-{
-       /* NB This is called as a side effect of other functions, but
-        * we had to release the lock to prevent deadlocks, so
-        * need to lock again.
-        */
-
-       struct yaffs_obj *obj;
-       struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb);
-
-       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);
-
-       obj = yaffs_find_by_number(dev, inode->i_ino);
-
-       yaffs_fill_inode_from_obj(inode, obj);
-
-       if (current != yaffs_dev_to_lc(dev)->readdir_process)
-               yaffs_gross_unlock(dev);
-}
-
+       .delete_inode = yaffs_delete_inode,
+       .clear_inode = yaffs_clear_inode,
 #endif
-
-static LIST_HEAD(yaffs_context_list);
-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);
-
-       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
-                       "yaffs_put_super");
-
-       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
-               "Shutting down yaffs background thread");
-       yaffs_bg_stop(dev);
-       yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
-               "yaffs background thread shut down");
-
-       yaffs_gross_lock(dev);
-
-       yaffs_flush_super(sb, 1);
-
-       yaffs_deinitialise(dev);
-
-       yaffs_gross_unlock(dev);
-
-       mutex_lock(&yaffs_context_lock);
-       list_del_init(&(yaffs_dev_to_lc(dev)->context_list));
-       mutex_unlock(&yaffs_context_lock);
-
-       if (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);
-
-       if (mtd && mtd->sync)
-               mtd->sync(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;
-
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_touch_super() sb = %p", sb);
-       if (sb)
-               sb->s_dirt = 1;
-}
+       .sync_fs = yaffs_sync_fs,
+       .write_super = yaffs_write_super,
+};
 
 struct yaffs_options {
        int inband_tags;
@@ -2603,6 +2556,24 @@ static int yaffs_parse_options(struct yaffs_options *options,
        return error;
 }
 
+
+static struct dentry *yaffs_make_root(struct inode *inode)
+{
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0))
+       struct dentry *root = d_alloc_root(inode);
+
+       if (!root)
+               iput(inode);
+
+        return root;
+#else
+        return d_make_root(inode);
+#endif
+}
+
+
+
+
 static struct super_block *yaffs_internal_read_super(int yaffs_version,
                                                     struct super_block *sb,
                                                     void *data, int silent)
@@ -2676,41 +2647,14 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
                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)
-               return NULL;    /* This isn't an mtd device */
-
        /* Get the device */
        mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
        if (!mtd) {
                yaffs_trace(YAFFS_TRACE_ALWAYS,
-                       "yaffs: MTD device #%u doesn't appear to exist",
+                       "yaffs: MTD device %u either not valid or unavailable",
                        MINOR(sb->s_dev));
                return NULL;
        }
-       /* Check it's NAND */
-       if (mtd->type != MTD_NANDFLASH) {
-               yaffs_trace(YAFFS_TRACE_ALWAYS,
-                       "yaffs: MTD device is not NAND it's type %d",
-                       mtd->type);
-               return NULL;
-       }
-
-       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)
-       yaffs_trace(YAFFS_TRACE_OS, " size %u", mtd->size);
-#else
-       yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size);
-#endif
 
        if (yaffs_auto_select && yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) {
                yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs2");
@@ -2724,54 +2668,8 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
                yaffs_version = 1;
        }
 
-       if (yaffs_version == 2) {
-               /* Check for version 2 style functions */
-               if (!mtd->erase ||
-                   !mtd->block_isbad ||
-                   !mtd->block_markbad || !mtd->read || !mtd->write ||
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-                   !mtd->read_oob || !mtd->write_oob) {
-#else
-                   !mtd->write_ecc ||
-                   !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
-#endif
-                       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) {
-                       yaffs_trace(YAFFS_TRACE_ALWAYS,
-                               "MTD device does not have the right page sizes"
-                       );
-                       return NULL;
-               }
-       } else {
-               /* Check for V1 style functions */
-               if (!mtd->erase || !mtd->read || !mtd->write ||
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-                   !mtd->read_oob || !mtd->write_oob) {
-#else
-                   !mtd->write_ecc ||
-                   !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
-#endif
-                       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) {
-                       yaffs_trace(YAFFS_TRACE_ALWAYS,
-                               "MTD device does not support have the right page sizes"
-                       );
-                       return NULL;
-               }
-       }
+       if(yaffs_verify_mtd(mtd, yaffs_version, options.inband_tags) < 0)
+               return NULL;
 
        /* OK, so if we got here, we have an MTD that's NAND and looks
         * like it has the right capabilities
@@ -2877,7 +2775,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
        yaffs_mtd_drv_install(dev);
 
-       param->sb_dirty_fn = yaffs_touch_super;
+       param->sb_dirty_fn = yaffs_set_super_dirty;
        param->gc_control_fn = yaffs_gc_control_callback;
 
        yaffs_dev_to_lc(dev)->super = sb;
@@ -2943,16 +2841,15 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
        yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: got root inode");
 
-       root = d_alloc_root(inode);
-
-       yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: d_alloc_root done");
+       root = yaffs_make_root(inode);
 
-       if (!root) {
-               iput(inode);
+       if (!root)
                return NULL;
-       }
+
        sb->s_root = root;
-       sb->s_dirt = !dev->is_checkpointed;
+       if(!dev->is_checkpointed)
+               yaffs_set_super_dirty(dev);
+
        yaffs_trace(YAFFS_TRACE_ALWAYS,
                "yaffs_read_super: is_checkpointed %d",
                dev->is_checkpointed);