kernel: update yaffs code
authorGabor Juhos <juhosg@openwrt.org>
Mon, 16 Dec 2013 07:51:19 +0000 (07:51 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Mon, 16 Dec 2013 07:51:19 +0000 (07:51 +0000)
Use the latest version of the yaffs code. Fetched from the
yaffs2 git tree and it is based on the following commit:

  commit bc76682d93955cfb33051beb503ad9f8a5450578
  Merge: 3a8580e ffa781d
  Author: Charles Manning <cdhmanning@gmail.com>
  Date:   Thu Jul 11 17:46:25 2013 +1200

      Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39084

110 files changed:
target/linux/generic/config-3.10
target/linux/generic/config-3.12
target/linux/generic/config-3.8
target/linux/generic/files/fs/yaffs2/Kconfig
target/linux/generic/files/fs/yaffs2/Makefile
target/linux/generic/files/fs/yaffs2/NOTE.openwrt
target/linux/generic/files/fs/yaffs2/devextras.h [deleted file]
target/linux/generic/files/fs/yaffs2/moduleconfig.h [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_allocator.c
target/linux/generic/files/fs/yaffs2/yaffs_allocator.h
target/linux/generic/files/fs/yaffs2/yaffs_attribs.c [new file with mode: 0644]
target/linux/generic/files/fs/yaffs2/yaffs_attribs.h [new file with mode: 0644]
target/linux/generic/files/fs/yaffs2/yaffs_bitmap.c
target/linux/generic/files/fs/yaffs2/yaffs_bitmap.h
target/linux/generic/files/fs/yaffs2/yaffs_checkptrw.c
target/linux/generic/files/fs/yaffs2/yaffs_checkptrw.h
target/linux/generic/files/fs/yaffs2/yaffs_ecc.c
target/linux/generic/files/fs/yaffs2/yaffs_ecc.h
target/linux/generic/files/fs/yaffs2/yaffs_getblockinfo.h
target/linux/generic/files/fs/yaffs2/yaffs_guts.c
target/linux/generic/files/fs/yaffs2/yaffs_guts.h
target/linux/generic/files/fs/yaffs2/yaffs_linux.h
target/linux/generic/files/fs/yaffs2/yaffs_linux_allocator.c [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_list.h [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_mtdif.c
target/linux/generic/files/fs/yaffs2/yaffs_mtdif.h
target/linux/generic/files/fs/yaffs2/yaffs_mtdif1.c [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_mtdif1.h [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_mtdif2.c [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_mtdif2.h [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_nameval.c
target/linux/generic/files/fs/yaffs2/yaffs_nameval.h
target/linux/generic/files/fs/yaffs2/yaffs_nand.c
target/linux/generic/files/fs/yaffs2/yaffs_nand.h
target/linux/generic/files/fs/yaffs2/yaffs_nandemul2k.h [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c
target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.h
target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c
target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.h
target/linux/generic/files/fs/yaffs2/yaffs_qsort.c [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_qsort.h [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_summary.c [new file with mode: 0644]
target/linux/generic/files/fs/yaffs2/yaffs_summary.h [new file with mode: 0644]
target/linux/generic/files/fs/yaffs2/yaffs_tagscompat.c
target/linux/generic/files/fs/yaffs2/yaffs_tagscompat.h
target/linux/generic/files/fs/yaffs2/yaffs_tagsmarshall.c [new file with mode: 0644]
target/linux/generic/files/fs/yaffs2/yaffs_tagsmarshall.h [new file with mode: 0644]
target/linux/generic/files/fs/yaffs2/yaffs_tagsvalidity.c [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_tagsvalidity.h [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_trace.h
target/linux/generic/files/fs/yaffs2/yaffs_verify.c
target/linux/generic/files/fs/yaffs2/yaffs_verify.h
target/linux/generic/files/fs/yaffs2/yaffs_vfs.c [new file with mode: 0644]
target/linux/generic/files/fs/yaffs2/yaffs_vfs_glue.c [deleted file]
target/linux/generic/files/fs/yaffs2/yaffs_yaffs1.c
target/linux/generic/files/fs/yaffs2/yaffs_yaffs1.h
target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c
target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.h
target/linux/generic/files/fs/yaffs2/yaffsinterface.h [deleted file]
target/linux/generic/files/fs/yaffs2/yportenv.h
target/linux/generic/patches-3.10/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch [new file with mode: 0644]
target/linux/generic/patches-3.10/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch [deleted file]
target/linux/generic/patches-3.10/502-yaffs-3.10-disable-proc-entry.patch [new file with mode: 0644]
target/linux/generic/patches-3.10/502-yaffs-Switch-from-semaphores-to-mutexes.patch [deleted file]
target/linux/generic/patches-3.10/503-yaffs-Replace-yaffs_dir_llseek-with-Linux-generic-ll.patch [deleted file]
target/linux/generic/patches-3.10/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch [deleted file]
target/linux/generic/patches-3.10/505-yaffs-3.2-use-MTD_OPS_AUTO_OOB.patch [deleted file]
target/linux/generic/patches-3.10/506-yaffs-3.2-dont-use-i_nlink-directly.patch [deleted file]
target/linux/generic/patches-3.10/507-yaffs-3.3_fix.patch [deleted file]
target/linux/generic/patches-3.10/508-yaffs-3.3-use-mtd_-helpers.patch [deleted file]
target/linux/generic/patches-3.10/509-yaffs-3.4-add-underscore-to-mtd-internal-names.patch [deleted file]
target/linux/generic/patches-3.10/510-yaffs-3.4-use-d_make_root.patch [deleted file]
target/linux/generic/patches-3.10/511-yaffs-3.5-use-clear_inode.patch [deleted file]
target/linux/generic/patches-3.10/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch [deleted file]
target/linux/generic/patches-3.10/513-yaffs-3.6-fix-dir_inode-ops.patch [deleted file]
target/linux/generic/patches-3.10/514-yaffs-3.6-use-delayed-work-instead-of-write_super.patch [deleted file]
target/linux/generic/patches-3.10/515-yaffs-3.10-disable-proc-entry.patch [deleted file]
target/linux/generic/patches-3.12/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch [new file with mode: 0644]
target/linux/generic/patches-3.12/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch [deleted file]
target/linux/generic/patches-3.12/502-yaffs-3.10-disable-proc-entry.patch [new file with mode: 0644]
target/linux/generic/patches-3.12/502-yaffs-Switch-from-semaphores-to-mutexes.patch [deleted file]
target/linux/generic/patches-3.12/503-yaffs-3.12-convert-readdir-to-iterate.patch [new file with mode: 0644]
target/linux/generic/patches-3.12/503-yaffs-Replace-yaffs_dir_llseek-with-Linux-generic-ll.patch [deleted file]
target/linux/generic/patches-3.12/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch [deleted file]
target/linux/generic/patches-3.12/505-yaffs-3.2-use-MTD_OPS_AUTO_OOB.patch [deleted file]
target/linux/generic/patches-3.12/506-yaffs-3.2-dont-use-i_nlink-directly.patch [deleted file]
target/linux/generic/patches-3.12/507-yaffs-3.3_fix.patch [deleted file]
target/linux/generic/patches-3.12/508-yaffs-3.3-use-mtd_-helpers.patch [deleted file]
target/linux/generic/patches-3.12/509-yaffs-3.4-add-underscore-to-mtd-internal-names.patch [deleted file]
target/linux/generic/patches-3.12/510-yaffs-3.4-use-d_make_root.patch [deleted file]
target/linux/generic/patches-3.12/511-yaffs-3.5-use-clear_inode.patch [deleted file]
target/linux/generic/patches-3.12/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch [deleted file]
target/linux/generic/patches-3.12/513-yaffs-3.6-fix-dir_inode-ops.patch [deleted file]
target/linux/generic/patches-3.12/514-yaffs-3.6-use-delayed-work-instead-of-write_super.patch [deleted file]
target/linux/generic/patches-3.12/515-yaffs-3.10-disable-proc-entry.patch [deleted file]
target/linux/generic/patches-3.8/501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch [new file with mode: 0644]
target/linux/generic/patches-3.8/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch [deleted file]
target/linux/generic/patches-3.8/502-yaffs-Switch-from-semaphores-to-mutexes.patch [deleted file]
target/linux/generic/patches-3.8/503-yaffs-Replace-yaffs_dir_llseek-with-Linux-generic-ll.patch [deleted file]
target/linux/generic/patches-3.8/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch [deleted file]
target/linux/generic/patches-3.8/505-yaffs-3.2-use-MTD_OPS_AUTO_OOB.patch [deleted file]
target/linux/generic/patches-3.8/506-yaffs-3.2-dont-use-i_nlink-directly.patch [deleted file]
target/linux/generic/patches-3.8/507-yaffs-3.3_fix.patch [deleted file]
target/linux/generic/patches-3.8/508-yaffs-3.3-use-mtd_-helpers.patch [deleted file]
target/linux/generic/patches-3.8/509-yaffs-3.4-add-underscore-to-mtd-internal-names.patch [deleted file]
target/linux/generic/patches-3.8/510-yaffs-3.4-use-d_make_root.patch [deleted file]
target/linux/generic/patches-3.8/511-yaffs-3.5-use-clear_inode.patch [deleted file]
target/linux/generic/patches-3.8/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch [deleted file]
target/linux/generic/patches-3.8/513-yaffs-3.6-fix-dir_inode-ops.patch [deleted file]
target/linux/generic/patches-3.8/514-yaffs-3.6-use-delayed-work-instead-of-write_super.patch [deleted file]

index e934c5e..0ae7971 100644 (file)
@@ -3994,6 +3994,7 @@ CONFIG_XZ_DEC=y
 # CONFIG_XZ_DEC_SPARC is not set
 # CONFIG_XZ_DEC_TEST is not set
 # CONFIG_XZ_DEC_X86 is not set
+# CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING is not set
 # CONFIG_YAFFS_FS is not set
 # CONFIG_YAM is not set
 # CONFIG_YELLOWFIN is not set
index a996bd5..ba72ede 100644 (file)
@@ -4140,6 +4140,7 @@ CONFIG_XZ_DEC=y
 # CONFIG_XZ_DEC_SPARC is not set
 # CONFIG_XZ_DEC_TEST is not set
 # CONFIG_XZ_DEC_X86 is not set
+# CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING is not set
 # CONFIG_YAFFS_FS is not set
 # CONFIG_YAM is not set
 # CONFIG_YELLOWFIN is not set
index 8d124da..b66fe19 100644 (file)
@@ -3862,6 +3862,7 @@ CONFIG_XZ_DEC=y
 # CONFIG_XZ_DEC_SPARC is not set
 # CONFIG_XZ_DEC_TEST is not set
 # CONFIG_XZ_DEC_X86 is not set
+# CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING is not set
 # CONFIG_YAFFS_FS is not set
 # CONFIG_YAM is not set
 # CONFIG_YELLOWFIN is not set
index 7b3988c..408570f 100644 (file)
@@ -1,23 +1,23 @@
 #
-# YAFFS file system configurations
+# yaffs file system configurations
 #
 
 config YAFFS_FS
-       tristate "YAFFS2 file system support"
+       tristate "yaffs2 file system support"
        default n
        depends on MTD_BLOCK
        select YAFFS_YAFFS1
        select YAFFS_YAFFS2
        help
-         YAFFS2, or Yet Another Flash Filing System, is a filing system
+         yaffs2, or Yet Another Flash File System, is a file system
          optimised for NAND Flash chips.
 
-         To compile the YAFFS2 file system support as a module, choose M
+         To compile the yaffs2 file system support as a module, choose M
          here: the module will be called yaffs2.
 
          If unsure, say N.
 
-         Further information on YAFFS2 is available at
+         Further information on yaffs2 is available at
          <http://www.aleph1.co.uk/yaffs/>.
 
 config YAFFS_YAFFS1
@@ -25,7 +25,7 @@ config YAFFS_YAFFS1
        depends on YAFFS_FS
        default y
        help
-         Enable YAFFS1 support -- yaffs for 512 byte / page devices
+         Enable yaffs1 support -- yaffs for 512 byte / page devices
 
          Not needed for 2K-page devices.
 
@@ -49,11 +49,11 @@ config YAFFS_9BYTE_TAGS
          If unsure, say N.
 
 config YAFFS_DOES_ECC
-       bool "Lets Yaffs do its own ECC"
+       bool "Lets yaffs do its own ECC"
        depends on YAFFS_FS && YAFFS_YAFFS1 && !YAFFS_9BYTE_TAGS
        default n
        help
-         This enables Yaffs to use its own ECC functions instead of using
+         This enables yaffs to use its own ECC functions instead of using
          the ones from the generic MTD-NAND driver.
 
          If unsure, say N.
@@ -74,7 +74,7 @@ config YAFFS_YAFFS2
        depends on YAFFS_FS
        default y
        help
-         Enable YAFFS2 support -- yaffs for >= 2K bytes per page devices
+         Enable yaffs2 support -- yaffs for >= 2K bytes per page devices
 
          If unsure, say Y.
 
@@ -91,39 +91,23 @@ config YAFFS_AUTO_YAFFS2
          If unsure, say Y.
 
 config YAFFS_DISABLE_TAGS_ECC
-       bool "Disable YAFFS from doing ECC on tags by default"
+       bool "Disable yaffs from doing ECC on tags by default"
        depends on YAFFS_FS && YAFFS_YAFFS2
        default n
        help
-         This defaults Yaffs to using its own ECC calculations on tags instead of
+         This defaults yaffs to using its own ECC calculations on tags instead of
          just relying on the MTD.
          This behavior can also be overridden with tags_ecc_on and
          tags_ecc_off mount options.
 
          If unsure, say N.
 
-
-config YAFFS_DISABLE_WIDE_TNODES
-       bool "Turn off wide tnodes"
-       depends on YAFFS_FS
-       default n
-       help
-         Wide tnodes are only used for NAND arrays >=32MB for 512-byte
-         page devices and >=128MB for 2k page devices. They use slightly
-         more RAM but are faster since they eliminate chunk group
-         searching.
-
-         Setting this to 'y' will force tnode width to 16 bits and save
-         memory but make large arrays slower.
-
-         If unsure, say N.
-
 config YAFFS_ALWAYS_CHECK_CHUNK_ERASED
        bool "Force chunk erase check"
        depends on YAFFS_FS
        default n
        help
-          Normally YAFFS only checks chunks before writing until an erased
+          Normally yaffs only checks chunks before writing until an erased
          chunk is found. This helps to detect any partially written
          chunks that might have happened due to power loss.
 
@@ -136,17 +120,6 @@ config YAFFS_ALWAYS_CHECK_CHUNK_ERASED
 
          If unsure, say Y.
 
-config YAFFS_SHORT_NAMES_IN_RAM
-       bool "Cache short names in RAM"
-       depends on YAFFS_FS
-       default y
-       help
-         If this config is set, then short names are stored with the
-         yaffs_Object.  This costs an extra 16 bytes of RAM per object,
-         but makes look-ups faster.
-
-         If unsure, say Y.
-
 config YAFFS_EMPTY_LOST_AND_FOUND
        bool "Empty lost and found on boot"
        depends on YAFFS_FS
@@ -177,7 +150,17 @@ config YAFFS_DISABLE_BACKGROUND
         If this is set, then background processing is disabled.
         Background processing makes many foreground activities faster.
 
-         If unsure, say N.
+        If unsure, say N.
+
+config YAFFS_DISABLE_BAD_BLOCK_MARKING
+       bool "Disable yaffs2 bad block marking"
+       depends on YAFFS_FS
+       default n
+       help
+        Useful during early flash bring up to prevent problems causing
+        lots of bad block marking.
+
+        If unsure, say N.
 
 config YAFFS_XATTR
        bool "Enable yaffs2 xattr support"
@@ -186,5 +169,3 @@ config YAFFS_XATTR
        help
         If this is set then yaffs2 will provide xattr support.
         If unsure, say Y.
-
-
index fbdbd4a..f9a9fb1 100644 (file)
@@ -4,14 +4,15 @@
 
 obj-$(CONFIG_YAFFS_FS) += yaffs.o
 
-yaffs-y := yaffs_ecc.o yaffs_vfs_glue.o yaffs_guts.o yaffs_checkptrw.o
+yaffs-y := yaffs_ecc.o yaffs_vfs.o yaffs_guts.o yaffs_checkptrw.o
 yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o
-yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
-yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
-yaffs-y += yaffs_nameval.o
+yaffs-y += yaffs_tagscompat.o yaffs_tagsmarshall.o
+yaffs-y += yaffs_mtdif.o
+yaffs-y += yaffs_nameval.o yaffs_attribs.o
 yaffs-y += yaffs_allocator.o
 yaffs-y += yaffs_yaffs1.o
 yaffs-y += yaffs_yaffs2.o
 yaffs-y += yaffs_bitmap.o
+yaffs-y += yaffs_summary.o
 yaffs-y += yaffs_verify.o
 
index 1ad01d0..0be479d 100644 (file)
@@ -1,4 +1,4 @@
 The yaffs2 source has been fetched from the yaffs2 GIT tree.
 
 URL: git://www.aleph1.co.uk/yaffs2
-Version: 7396445d7d0d13469b9505791114b9dc6b76ffe4 (2010-10-20)
+Version: bc76682d93955cfb33051beb503ad9f8a5450578 (2013-12-03)
diff --git a/target/linux/generic/files/fs/yaffs2/devextras.h b/target/linux/generic/files/fs/yaffs2/devextras.h
deleted file mode 100644 (file)
index ce30c82..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2010 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/*
- * This file is just holds extra declarations of macros that would normally
- * be providesd in the Linux kernel. These macros have been written from
- * scratch but are functionally equivalent to the Linux ones.
- *
- */
-
-#ifndef __EXTRAS_H__
-#define __EXTRAS_H__
-
-
-#include "yportenv.h"
-
-#if !(defined __KERNEL__)
-
-/* Definition of types */
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned __u32;
-
-#endif
-
-
-#if !(defined __KERNEL__)
-
-
-#ifndef WIN32
-#include <sys/stat.h>
-#endif
-
-
-#ifdef CONFIG_YAFFS_PROVIDE_DEFS
-/* File types */
-
-
-#define DT_UNKNOWN     0
-#define DT_FIFO                1
-#define DT_CHR         2
-#define DT_DIR         4
-#define DT_BLK         6
-#define DT_REG         8
-#define DT_LNK         10
-#define DT_SOCK                12
-#define DT_WHT         14
-
-
-#ifndef WIN32
-#include <sys/stat.h>
-#endif
-
-/*
- * Attribute flags.  These should be or-ed together to figure out what
- * has been changed!
- */
-#define ATTR_MODE      1
-#define ATTR_UID       2
-#define ATTR_GID       4
-#define ATTR_SIZE      8
-#define ATTR_ATIME     16
-#define ATTR_MTIME     32
-#define ATTR_CTIME     64
-
-struct iattr {
-       unsigned int ia_valid;
-       unsigned ia_mode;
-       unsigned ia_uid;
-       unsigned ia_gid;
-       unsigned ia_size;
-       unsigned ia_atime;
-       unsigned ia_mtime;
-       unsigned ia_ctime;
-       unsigned int ia_attr_flags;
-};
-
-#endif
-
-#else
-
-#include <linux/types.h>
-#include <linux/fs.h>
-#include <linux/stat.h>
-
-#endif
-
-
-#endif
diff --git a/target/linux/generic/files/fs/yaffs2/moduleconfig.h b/target/linux/generic/files/fs/yaffs2/moduleconfig.h
deleted file mode 100644 (file)
index 4b4d642..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2010 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Martin Fouts <Martin.Fouts@palmsource.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-#ifndef __YAFFS_CONFIG_H__
-#define __YAFFS_CONFIG_H__
-
-#ifdef YAFFS_OUT_OF_TREE
-
-/* DO NOT UNSET THESE THREE. YAFFS2 will not compile if you do. */
-#define CONFIG_YAFFS_FS
-#define CONFIG_YAFFS_YAFFS1
-#define CONFIG_YAFFS_YAFFS2
-
-/* These options are independent of each other.  Select those that matter. */
-
-/* Default: Not selected */
-/* Meaning: Yaffs does its own ECC, rather than using MTD ECC */
-/* #define CONFIG_YAFFS_DOES_ECC */
-
-/* Default: Selected */
-/* Meaning: Yaffs does its own ECC on tags for packed tags rather than use mtd */
-#define CONFIG_YAFFS_DOES_TAGS_ECC
-
-/* Default: Not selected */
-/* Meaning: ECC byte order is 'wrong'.  Only meaningful if */
-/*          CONFIG_YAFFS_DOES_ECC is set */
-/* #define CONFIG_YAFFS_ECC_WRONG_ORDER */
-
-/* Default: Not selected */
-/* Meaning: Always test whether chunks are erased before writing to them.
-           Use during mtd debugging and init. */
-/* #define CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED */
-
-/* Default: Not Selected */
-/* Meaning: At mount automatically empty all files from lost and found. */
-/* This is done to fix an old problem where rmdir was not checking for an */
-/* empty directory. This can also be achieved with a mount option. */
-#define CONFIG_YAFFS_EMPTY_LOST_AND_FOUND
-
-/* Default: Selected */
-/* Meaning: Cache short names, taking more RAM, but faster look-ups */
-#define CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-
-/* Default: Unselected */
-/* Meaning: Select to disable block refreshing. */
-/* Block Refreshing periodically rewrites the oldest block. */
-/* #define CONFIG_DISABLE_BLOCK_REFRESHING */
-
-/* Default: Unselected */
-/* Meaning: Select to disable background processing */
-/* #define CONFIG_DISABLE_BACKGROUND */
-
-
-/* Default: Selected */
-/* Meaning: Enable XATTR support */
-#define CONFIG_YAFFS_XATTR
-
-/*
-Older-style on-NAND data format has a "page_status" byte to record
-chunk/page state.  This byte is zeroed when the page is discarded.
-Choose this option if you have existing on-NAND data in this format
-that you need to continue to support.  New data written also uses the
-older-style format.
-Note: Use of this option generally requires that MTD's oob layout be
-adjusted to use the older-style format.  See notes on tags formats and
-MTD versions in yaffs_mtdif1.c.
-*/
-/* Default: Not selected */
-/* Meaning: Use older-style on-NAND data format with page_status byte */
-/* #define CONFIG_YAFFS_9BYTE_TAGS */
-
-#endif /* YAFFS_OUT_OF_TREE */
-
-#endif /* __YAFFS_CONFIG_H__ */
index c0513d5..c8f2861 100644 (file)
 /*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  */
 
-
 #include "yaffs_allocator.h"
 #include "yaffs_guts.h"
 #include "yaffs_trace.h"
 #include "yportenv.h"
 
-#ifdef CONFIG_YAFFS_YMALLOC_ALLOCATOR
-
-void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
-{
-       dev = dev;
-}
-
-void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
-{
-       dev = dev;
-}
-
-yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
-{
-       return (yaffs_tnode_t *)YMALLOC(dev->tnode_size);
-}
-
-void yaffs_free_raw_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
-{
-       dev = dev;
-       YFREE(tn);
-}
-
-void yaffs_init_raw_objs(yaffs_dev_t *dev)
-{
-       dev = dev;
-}
-
-void yaffs_deinit_raw_objs(yaffs_dev_t *dev)
-{
-       dev = dev;
-}
-
-yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
-{
-       dev = dev;
-       return (yaffs_obj_t *) YMALLOC(sizeof(yaffs_obj_t));
-}
-
-
-void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj)
-{
-
-       dev = dev;
-       YFREE(obj);
-}
-
-#else
+/*
+ * Each entry in yaffs_tnode_list and yaffs_obj_list hold blocks
+ * of approx 100 objects that are themn allocated singly.
+ * This is basically a simplified slab allocator.
+ *
+ * We don't use the Linux slab allocator because slab does not allow
+ * us to dump all the objects in one hit when we do a umount and tear
+ * down  all the tnodes and objects. slab requires that we first free
+ * the individual objects.
+ *
+ * Once yaffs has been mainlined I shall try to motivate for a change
+ * to slab to provide the extra features we need here.
+ */
 
 struct yaffs_tnode_list {
        struct yaffs_tnode_list *next;
-       yaffs_tnode_t *tnodes;
+       struct yaffs_tnode *tnodes;
 };
 
-typedef struct yaffs_tnode_list yaffs_tnodelist_t;
-
-struct yaffs_obj_tList_struct {
-       yaffs_obj_t *objects;
-       struct yaffs_obj_tList_struct *next;
+struct yaffs_obj_list {
+       struct yaffs_obj_list *next;
+       struct yaffs_obj *objects;
 };
 
-typedef struct yaffs_obj_tList_struct yaffs_obj_tList;
-
+struct yaffs_allocator {
+       int n_tnodes_created;
+       struct yaffs_tnode *free_tnodes;
+       int n_free_tnodes;
+       struct yaffs_tnode_list *alloc_tnode_list;
 
-struct yaffs_AllocatorStruct {
-       int n_tnodesCreated;
-       yaffs_tnode_t *freeTnodes;
-       int nFreeTnodes;
-       yaffs_tnodelist_t *allocatedTnodeList;
+       int n_obj_created;
+       struct list_head free_objs;
+       int n_free_objects;
 
-       int n_objCreated;
-       yaffs_obj_t *freeObjects;
-       int nFreeObjects;
-
-       yaffs_obj_tList *allocatedObjectList;
+       struct yaffs_obj_list *allocated_obj_list;
 };
 
-typedef struct yaffs_AllocatorStruct yaffs_Allocator;
-
-
-static void yaffs_deinit_raw_tnodes(yaffs_dev_t *dev)
+static void yaffs_deinit_raw_tnodes(struct yaffs_dev *dev)
 {
+       struct yaffs_allocator *allocator =
+           (struct yaffs_allocator *)dev->allocator;
+       struct yaffs_tnode_list *tmp;
 
-       yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
-
-       yaffs_tnodelist_t *tmp;
-
-       if(!allocator){
-               YBUG();
+       if (!allocator) {
+               BUG();
                return;
        }
 
-       while (allocator->allocatedTnodeList) {
-               tmp = allocator->allocatedTnodeList->next;
-
-               YFREE(allocator->allocatedTnodeList->tnodes);
-               YFREE(allocator->allocatedTnodeList);
-               allocator->allocatedTnodeList = tmp;
+       while (allocator->alloc_tnode_list) {
+               tmp = allocator->alloc_tnode_list->next;
 
+               kfree(allocator->alloc_tnode_list->tnodes);
+               kfree(allocator->alloc_tnode_list);
+               allocator->alloc_tnode_list = tmp;
        }
 
-       allocator->freeTnodes = NULL;
-       allocator->nFreeTnodes = 0;
-       allocator->n_tnodesCreated = 0;
+       allocator->free_tnodes = NULL;
+       allocator->n_free_tnodes = 0;
+       allocator->n_tnodes_created = 0;
 }
 
-static void yaffs_init_raw_tnodes(yaffs_dev_t *dev)
+static void yaffs_init_raw_tnodes(struct yaffs_dev *dev)
 {
-       yaffs_Allocator *allocator = dev->allocator;
-
-       if(allocator){
-               allocator->allocatedTnodeList = NULL;
-               allocator->freeTnodes = NULL;
-               allocator->nFreeTnodes = 0;
-               allocator->n_tnodesCreated = 0;
-       } else
-               YBUG();
+       struct yaffs_allocator *allocator = dev->allocator;
+
+       if (!allocator) {
+               BUG();
+               return;
+       }
+
+       allocator->alloc_tnode_list = NULL;
+       allocator->free_tnodes = NULL;
+       allocator->n_free_tnodes = 0;
+       allocator->n_tnodes_created = 0;
 }
 
-static int yaffs_create_tnodes(yaffs_dev_t *dev, int n_tnodes)
+static int yaffs_create_tnodes(struct yaffs_dev *dev, int n_tnodes)
 {
-       yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
+       struct yaffs_allocator *allocator =
+           (struct yaffs_allocator *)dev->allocator;
        int i;
-       yaffs_tnode_t *newTnodes;
-       __u8 *mem;
-       yaffs_tnode_t *curr;
-       yaffs_tnode_t *next;
-       yaffs_tnodelist_t *tnl;
-
-       if(!allocator){
-               YBUG();
+       struct yaffs_tnode *new_tnodes;
+       u8 *mem;
+       struct yaffs_tnode *curr;
+       struct yaffs_tnode *next;
+       struct yaffs_tnode_list *tnl;
+
+       if (!allocator) {
+               BUG();
                return YAFFS_FAIL;
        }
 
        if (n_tnodes < 1)
                return YAFFS_OK;
 
-
        /* make these things */
+       new_tnodes = kmalloc(n_tnodes * dev->tnode_size, GFP_NOFS);
+       mem = (u8 *) new_tnodes;
 
-       newTnodes = YMALLOC(n_tnodes * dev->tnode_size);
-       mem = (__u8 *)newTnodes;
-
-       if (!newTnodes) {
-               T(YAFFS_TRACE_ERROR,
-                       (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
+       if (!new_tnodes) {
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "yaffs: Could not allocate Tnodes");
                return YAFFS_FAIL;
        }
 
        /* New hookup for wide tnodes */
        for (i = 0; i < n_tnodes - 1; i++) {
-               curr = (yaffs_tnode_t *) &mem[i * dev->tnode_size];
-               next = (yaffs_tnode_t *) &mem[(i+1) * dev->tnode_size];
+               curr = (struct yaffs_tnode *)&mem[i * dev->tnode_size];
+               next = (struct yaffs_tnode *)&mem[(i + 1) * dev->tnode_size];
                curr->internal[0] = next;
        }
 
-       curr = (yaffs_tnode_t *) &mem[(n_tnodes - 1) * dev->tnode_size];
-       curr->internal[0] = allocator->freeTnodes;
-       allocator->freeTnodes = (yaffs_tnode_t *)mem;
+       curr = (struct yaffs_tnode *)&mem[(n_tnodes - 1) * dev->tnode_size];
+       curr->internal[0] = allocator->free_tnodes;
+       allocator->free_tnodes = (struct yaffs_tnode *)mem;
 
-       allocator->nFreeTnodes += n_tnodes;
-       allocator->n_tnodesCreated += n_tnodes;
+       allocator->n_free_tnodes += n_tnodes;
+       allocator->n_tnodes_created += n_tnodes;
 
        /* Now add this bunch of tnodes to a list for freeing up.
         * NB If we can't add this to the management list it isn't fatal
         * but it just means we can't free this bunch of tnodes later.
         */
-
-       tnl = YMALLOC(sizeof(yaffs_tnodelist_t));
+       tnl = kmalloc(sizeof(struct yaffs_tnode_list), GFP_NOFS);
        if (!tnl) {
-               T(YAFFS_TRACE_ERROR,
-                 (TSTR
-                  ("yaffs: Could not add tnodes to management list" TENDSTR)));
-                  return YAFFS_FAIL;
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "Could not add tnodes to management list");
+               return YAFFS_FAIL;
        } else {
-               tnl->tnodes = newTnodes;
-               tnl->next = allocator->allocatedTnodeList;
-               allocator->allocatedTnodeList = tnl;
+               tnl->tnodes = new_tnodes;
+               tnl->next = allocator->alloc_tnode_list;
+               allocator->alloc_tnode_list = tnl;
        }
 
-       T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR)));
+       yaffs_trace(YAFFS_TRACE_ALLOCATE, "Tnodes added");
 
        return YAFFS_OK;
 }
 
-
-yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
+struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
 {
-       yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
-       yaffs_tnode_t *tn = NULL;
+       struct yaffs_allocator *allocator =
+           (struct yaffs_allocator *)dev->allocator;
+       struct yaffs_tnode *tn = NULL;
 
-       if(!allocator){
-               YBUG();
+       if (!allocator) {
+               BUG();
                return NULL;
        }
 
        /* If there are none left make more */
-       if (!allocator->freeTnodes)
+       if (!allocator->free_tnodes)
                yaffs_create_tnodes(dev, YAFFS_ALLOCATION_NTNODES);
 
-       if (allocator->freeTnodes) {
-               tn = allocator->freeTnodes;
-               allocator->freeTnodes = allocator->freeTnodes->internal[0];
-               allocator->nFreeTnodes--;
+       if (allocator->free_tnodes) {
+               tn = allocator->free_tnodes;
+               allocator->free_tnodes = allocator->free_tnodes->internal[0];
+               allocator->n_free_tnodes--;
        }
 
        return tn;
 }
 
 /* FreeTnode frees up a tnode and puts it back on the free list */
-void yaffs_free_raw_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
+void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
 {
-       yaffs_Allocator *allocator = dev->allocator;
+       struct yaffs_allocator *allocator = dev->allocator;
 
-       if(!allocator){
-               YBUG();
+       if (!allocator) {
+               BUG();
                return;
        }
 
        if (tn) {
-               tn->internal[0] = allocator->freeTnodes;
-               allocator->freeTnodes = tn;
-               allocator->nFreeTnodes++;
+               tn->internal[0] = allocator->free_tnodes;
+               allocator->free_tnodes = tn;
+               allocator->n_free_tnodes++;
        }
-       dev->checkpoint_blocks_required = 0; /* force recalculation*/
+       dev->checkpoint_blocks_required = 0;    /* force recalculation */
 }
 
+/*--------------- yaffs_obj alloaction ------------------------
+ *
+ * Free yaffs_objs are stored in a list using obj->siblings.
+ * The blocks of allocated objects are stored in a linked list.
+ */
 
-
-static void yaffs_init_raw_objs(yaffs_dev_t *dev)
+static void yaffs_init_raw_objs(struct yaffs_dev *dev)
 {
-       yaffs_Allocator *allocator = dev->allocator;
-
-       if(allocator) {
-               allocator->allocatedObjectList = NULL;
-               allocator->freeObjects = NULL;
-               allocator->nFreeObjects = 0;
-       } else
-               YBUG();
+       struct yaffs_allocator *allocator = dev->allocator;
+
+       if (!allocator) {
+               BUG();
+               return;
+       }
+
+       allocator->allocated_obj_list = NULL;
+       INIT_LIST_HEAD(&allocator->free_objs);
+       allocator->n_free_objects = 0;
 }
 
-static void yaffs_deinit_raw_objs(yaffs_dev_t *dev)
+static void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
 {
-       yaffs_Allocator *allocator = dev->allocator;
-       yaffs_obj_tList *tmp;
+       struct yaffs_allocator *allocator = dev->allocator;
+       struct yaffs_obj_list *tmp;
 
-       if(!allocator){
-               YBUG();
+       if (!allocator) {
+               BUG();
                return;
        }
 
-       while (allocator->allocatedObjectList) {
-               tmp = allocator->allocatedObjectList->next;
-               YFREE(allocator->allocatedObjectList->objects);
-               YFREE(allocator->allocatedObjectList);
-
-               allocator->allocatedObjectList = tmp;
+       while (allocator->allocated_obj_list) {
+               tmp = allocator->allocated_obj_list->next;
+               kfree(allocator->allocated_obj_list->objects);
+               kfree(allocator->allocated_obj_list);
+               allocator->allocated_obj_list = tmp;
        }
 
-       allocator->freeObjects = NULL;
-       allocator->nFreeObjects = 0;
-       allocator->n_objCreated = 0;
+       INIT_LIST_HEAD(&allocator->free_objs);
+       allocator->n_free_objects = 0;
+       allocator->n_obj_created = 0;
 }
 
-
-static int yaffs_create_free_objs(yaffs_dev_t *dev, int n_obj)
+static int yaffs_create_free_objs(struct yaffs_dev *dev, int n_obj)
 {
-       yaffs_Allocator *allocator = dev->allocator;
-
+       struct yaffs_allocator *allocator = dev->allocator;
        int i;
-       yaffs_obj_t *newObjects;
-       yaffs_obj_tList *list;
+       struct yaffs_obj *new_objs;
+       struct yaffs_obj_list *list;
 
-       if(!allocator){
-               YBUG();
+       if (!allocator) {
+               BUG();
                return YAFFS_FAIL;
        }
 
@@ -301,109 +255,103 @@ static int yaffs_create_free_objs(yaffs_dev_t *dev, int n_obj)
                return YAFFS_OK;
 
        /* make these things */
-       newObjects = YMALLOC(n_obj * sizeof(yaffs_obj_t));
-       list = YMALLOC(sizeof(yaffs_obj_tList));
-
-       if (!newObjects || !list) {
-               if (newObjects){
-                       YFREE(newObjects);
-                       newObjects = NULL;
-               }
-               if (list){
-                       YFREE(list);
-                       list = NULL;
-               }
-               T(YAFFS_TRACE_ALLOCATE,
-                 (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
+       new_objs = kmalloc(n_obj * sizeof(struct yaffs_obj), GFP_NOFS);
+       list = kmalloc(sizeof(struct yaffs_obj_list), GFP_NOFS);
+
+       if (!new_objs || !list) {
+               kfree(new_objs);
+               new_objs = NULL;
+               kfree(list);
+               list = NULL;
+               yaffs_trace(YAFFS_TRACE_ALLOCATE,
+                       "Could not allocate more objects");
                return YAFFS_FAIL;
        }
 
        /* Hook them into the free list */
-       for (i = 0; i < n_obj - 1; i++) {
-               newObjects[i].siblings.next =
-                               (struct ylist_head *)(&newObjects[i + 1]);
-       }
+       for (i = 0; i < n_obj; i++)
+               list_add(&new_objs[i].siblings, &allocator->free_objs);
 
-       newObjects[n_obj - 1].siblings.next = (void *)allocator->freeObjects;
-       allocator->freeObjects = newObjects;
-       allocator->nFreeObjects += n_obj;
-       allocator->n_objCreated += n_obj;
+       allocator->n_free_objects += n_obj;
+       allocator->n_obj_created += n_obj;
 
        /* Now add this bunch of Objects to a list for freeing up. */
 
-       list->objects = newObjects;
-       list->next = allocator->allocatedObjectList;
-       allocator->allocatedObjectList = list;
+       list->objects = new_objs;
+       list->next = allocator->allocated_obj_list;
+       allocator->allocated_obj_list = list;
 
        return YAFFS_OK;
 }
 
-yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
 {
-       yaffs_obj_t *obj = NULL;
-       yaffs_Allocator *allocator = dev->allocator;
+       struct yaffs_obj *obj = NULL;
+       struct list_head *lh;
+       struct yaffs_allocator *allocator = dev->allocator;
 
-       if(!allocator) {
-               YBUG();
+       if (!allocator) {
+               BUG();
                return obj;
        }
 
        /* If there are none left make more */
-       if (!allocator->freeObjects)
+       if (list_empty(&allocator->free_objs))
                yaffs_create_free_objs(dev, YAFFS_ALLOCATION_NOBJECTS);
 
-       if (allocator->freeObjects) {
-               obj = allocator->freeObjects;
-               allocator->freeObjects =
-                       (yaffs_obj_t *) (allocator->freeObjects->siblings.next);
-               allocator->nFreeObjects--;
+       if (!list_empty(&allocator->free_objs)) {
+               lh = allocator->free_objs.next;
+               obj = list_entry(lh, struct yaffs_obj, siblings);
+               list_del_init(lh);
+               allocator->n_free_objects--;
        }
 
        return obj;
 }
 
-
-void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj)
+void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj)
 {
 
-       yaffs_Allocator *allocator = dev->allocator;
+       struct yaffs_allocator *allocator = dev->allocator;
 
-       if(!allocator)
-               YBUG();
-       else {
-               /* Link into the free list. */
-               obj->siblings.next = (struct ylist_head *)(allocator->freeObjects);
-               allocator->freeObjects = obj;
-               allocator->nFreeObjects++;
+       if (!allocator) {
+               BUG();
+               return;
        }
+
+       /* Link into the free list. */
+       list_add(&obj->siblings, &allocator->free_objs);
+       allocator->n_free_objects++;
 }
 
-void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
 {
-       if(dev->allocator){
-               yaffs_deinit_raw_tnodes(dev);
-               yaffs_deinit_raw_objs(dev);
-
-               YFREE(dev->allocator);
-               dev->allocator=NULL;
-       } else
-               YBUG();
+
+       if (!dev->allocator) {
+               BUG();
+               return;
+       }
+
+       yaffs_deinit_raw_tnodes(dev);
+       yaffs_deinit_raw_objs(dev);
+       kfree(dev->allocator);
+       dev->allocator = NULL;
 }
 
-void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
 {
-       yaffs_Allocator *allocator;
-
-       if(!dev->allocator){
-               allocator = YMALLOC(sizeof(yaffs_Allocator));
-               if(allocator){
-                       dev->allocator = allocator;
-                       yaffs_init_raw_tnodes(dev);
-                       yaffs_init_raw_objs(dev);
-               }
-       } else
-               YBUG();
-}
+       struct yaffs_allocator *allocator;
 
+       if (dev->allocator) {
+               BUG();
+               return;
+       }
+
+       allocator = kmalloc(sizeof(struct yaffs_allocator), GFP_NOFS);
+       if (allocator) {
+               dev->allocator = allocator;
+               yaffs_init_raw_tnodes(dev);
+               yaffs_init_raw_objs(dev);
+       }
+}
 
-#endif
index 777f3b0..a8cc322 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
 
 #include "yaffs_guts.h"
 
-void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev);
-void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev);
+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev);
+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev);
 
-yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev);
-void yaffs_free_raw_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn);
+struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev);
+void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn);
 
-yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev);
-void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj);
+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev);
+void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj);
 
 #endif
diff --git a/target/linux/generic/files/fs/yaffs2/yaffs_attribs.c b/target/linux/generic/files/fs/yaffs2/yaffs_attribs.c
new file mode 100644 (file)
index 0000000..3d778f2
--- /dev/null
@@ -0,0 +1,124 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "yaffs_guts.h"
+#include "yaffs_attribs.h"
+
+void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh)
+{
+       obj->yst_uid = oh->yst_uid;
+       obj->yst_gid = oh->yst_gid;
+       obj->yst_atime = oh->yst_atime;
+       obj->yst_mtime = oh->yst_mtime;
+       obj->yst_ctime = oh->yst_ctime;
+       obj->yst_rdev = oh->yst_rdev;
+}
+
+void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj)
+{
+       oh->yst_uid = obj->yst_uid;
+       oh->yst_gid = obj->yst_gid;
+       oh->yst_atime = obj->yst_atime;
+       oh->yst_mtime = obj->yst_mtime;
+       oh->yst_ctime = obj->yst_ctime;
+       oh->yst_rdev = obj->yst_rdev;
+
+}
+
+void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c)
+{
+       obj->yst_mtime = Y_CURRENT_TIME;
+       if (do_a)
+               obj->yst_atime = obj->yst_mtime;
+       if (do_c)
+               obj->yst_ctime = obj->yst_mtime;
+}
+
+void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev)
+{
+       yaffs_load_current_time(obj, 1, 1);
+       obj->yst_rdev = rdev;
+       obj->yst_uid = uid;
+       obj->yst_gid = gid;
+}
+
+static loff_t yaffs_get_file_size(struct yaffs_obj *obj)
+{
+       YCHAR *alias = NULL;
+       obj = yaffs_get_equivalent_obj(obj);
+
+       switch (obj->variant_type) {
+       case YAFFS_OBJECT_TYPE_FILE:
+               return obj->variant.file_variant.file_size;
+       case YAFFS_OBJECT_TYPE_SYMLINK:
+               alias = obj->variant.symlink_variant.alias;
+               if (!alias)
+                       return 0;
+               return strnlen(alias, YAFFS_MAX_ALIAS_LENGTH);
+       default:
+               return 0;
+       }
+}
+
+int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr)
+{
+       unsigned int valid = attr->ia_valid;
+
+       if (valid & ATTR_MODE)
+               obj->yst_mode = attr->ia_mode;
+       if (valid & ATTR_UID)
+               obj->yst_uid = attr->ia_uid;
+       if (valid & ATTR_GID)
+               obj->yst_gid = attr->ia_gid;
+
+       if (valid & ATTR_ATIME)
+               obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime);
+       if (valid & ATTR_CTIME)
+               obj->yst_ctime = Y_TIME_CONVERT(attr->ia_ctime);
+       if (valid & ATTR_MTIME)
+               obj->yst_mtime = Y_TIME_CONVERT(attr->ia_mtime);
+
+       if (valid & ATTR_SIZE)
+               yaffs_resize_file(obj, attr->ia_size);
+
+       yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
+
+       return YAFFS_OK;
+
+}
+
+int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr)
+{
+       unsigned int valid = 0;
+
+       attr->ia_mode = obj->yst_mode;
+       valid |= ATTR_MODE;
+       attr->ia_uid = obj->yst_uid;
+       valid |= ATTR_UID;
+       attr->ia_gid = obj->yst_gid;
+       valid |= ATTR_GID;
+
+       Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime;
+       valid |= ATTR_ATIME;
+       Y_TIME_CONVERT(attr->ia_ctime) = obj->yst_ctime;
+       valid |= ATTR_CTIME;
+       Y_TIME_CONVERT(attr->ia_mtime) = obj->yst_mtime;
+       valid |= ATTR_MTIME;
+
+       attr->ia_size = yaffs_get_file_size(obj);
+       valid |= ATTR_SIZE;
+
+       attr->ia_valid = valid;
+
+       return YAFFS_OK;
+}
diff --git a/target/linux/generic/files/fs/yaffs2/yaffs_attribs.h b/target/linux/generic/files/fs/yaffs2/yaffs_attribs.h
new file mode 100644 (file)
index 0000000..5b21b08
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+#ifndef __YAFFS_ATTRIBS_H__
+#define __YAFFS_ATTRIBS_H__
+
+#include "yaffs_guts.h"
+
+void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh);
+void yaffs_load_attribs_oh(struct yaffs_obj_hdr *oh, struct yaffs_obj *obj);
+void yaffs_attribs_init(struct yaffs_obj *obj, u32 gid, u32 uid, u32 rdev);
+void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c);
+int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr);
+int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr);
+
+#endif
index 1769e9b..4440e93 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  * Chunk bitmap manipulations
  */
 
-static Y_INLINE __u8 *yaffs_BlockBits(yaffs_dev_t *dev, int blk)
+static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk)
 {
        if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
-               T(YAFFS_TRACE_ERROR,
-                       (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-                       blk));
-               YBUG();
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "BlockBits block %d is not valid",
+                       blk);
+               BUG();
        }
        return dev->chunk_bits +
-               (dev->chunk_bit_stride * (blk - dev->internal_start_block));
+           (dev->chunk_bit_stride * (blk - dev->internal_start_block));
 }
 
-void yaffs_verify_chunk_bit_id(yaffs_dev_t *dev, int blk, int chunk)
+void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk)
 {
        if (blk < dev->internal_start_block || blk > dev->internal_end_block ||
-                       chunk < 0 || chunk >= dev->param.chunks_per_block) {
-               T(YAFFS_TRACE_ERROR,
-               (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-                       blk, chunk));
-               YBUG();
+           chunk < 0 || chunk >= dev->param.chunks_per_block) {
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "Chunk Id (%d:%d) invalid",
+                       blk, chunk);
+               BUG();
        }
 }
 
-void yaffs_clear_chunk_bits(yaffs_dev_t *dev, int blk)
+void yaffs_clear_chunk_bits(struct yaffs_dev *dev, int blk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
 
-       memset(blkBits, 0, dev->chunk_bit_stride);
+       memset(blk_bits, 0, dev->chunk_bit_stride);
 }
 
-void yaffs_clear_chunk_bit(yaffs_dev_t *dev, int blk, int chunk)
+void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
 
        yaffs_verify_chunk_bit_id(dev, blk, chunk);
-
-       blkBits[chunk / 8] &= ~(1 << (chunk & 7));
+       blk_bits[chunk / 8] &= ~(1 << (chunk & 7));
 }
 
-void yaffs_set_chunk_bit(yaffs_dev_t *dev, int blk, int chunk)
+void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
 
        yaffs_verify_chunk_bit_id(dev, blk, chunk);
-
-       blkBits[chunk / 8] |= (1 << (chunk & 7));
+       blk_bits[chunk / 8] |= (1 << (chunk & 7));
 }
 
-int yaffs_check_chunk_bit(yaffs_dev_t *dev, int blk, int chunk)
+int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
-       yaffs_verify_chunk_bit_id(dev, blk, chunk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
 
-       return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
+       yaffs_verify_chunk_bit_id(dev, blk, chunk);
+       return (blk_bits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
 }
 
-int yaffs_still_some_chunks(yaffs_dev_t *dev, int blk)
+int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
        int i;
+
        for (i = 0; i < dev->chunk_bit_stride; i++) {
-               if (*blkBits)
+               if (*blk_bits)
                        return 1;
-               blkBits++;
+               blk_bits++;
        }
        return 0;
 }
 
-int yaffs_count_chunk_bits(yaffs_dev_t *dev, int blk)
+int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk)
 {
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
+       u8 *blk_bits = yaffs_block_bits(dev, blk);
        int i;
        int n = 0;
-       for (i = 0; i < dev->chunk_bit_stride; i++) {
-               __u8 x = *blkBits;
-               while (x) {
-                       if (x & 1)
-                               n++;
-                       x >>= 1;
-               }
-
-               blkBits++;
-       }
+
+       for (i = 0; i < dev->chunk_bit_stride; i++, blk_bits++)
+               n += hweight8(*blk_bits);
+
        return n;
 }
-
index c11ca2f..e26b37d 100644 (file)
@@ -1,14 +1,16 @@
 /*
- * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
  * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  */
 
 /*
 
 #include "yaffs_guts.h"
 
-void yaffs_verify_chunk_bit_id(yaffs_dev_t *dev, int blk, int chunk);
-void yaffs_clear_chunk_bits(yaffs_dev_t *dev, int blk);
-void yaffs_clear_chunk_bit(yaffs_dev_t *dev, int blk, int chunk);
-void yaffs_set_chunk_bit(yaffs_dev_t *dev, int blk, int chunk);
-int yaffs_check_chunk_bit(yaffs_dev_t *dev, int blk, int chunk);
-int yaffs_still_some_chunks(yaffs_dev_t *dev, int blk);
-int yaffs_count_chunk_bits(yaffs_dev_t *dev, int blk);
+void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk);
+void yaffs_clear_chunk_bits(struct yaffs_dev *dev, int blk);
+void yaffs_clear_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
+void yaffs_set_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
+int yaffs_check_chunk_bit(struct yaffs_dev *dev, int blk, int chunk);
+int yaffs_still_some_chunks(struct yaffs_dev *dev, int blk);
+int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk);
 
 #endif
index d46f563..e739fb4 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
 #include "yaffs_checkptrw.h"
 #include "yaffs_getblockinfo.h"
 
-static int yaffs2_checkpt_space_ok(yaffs_dev_t *dev)
+struct yaffs_checkpt_chunk_hdr {
+       int version;
+       int seq;
+       u32 sum;
+       u32 xor;
+} ;
+
+
+static int apply_chunk_offset(struct yaffs_dev *dev, int chunk)
+{
+       return chunk - dev->chunk_offset;
+}
+
+static int apply_block_offset(struct yaffs_dev *dev, int block)
+{
+       return block - dev->block_offset;
+}
+
+static void yaffs2_checkpt_init_chunk_hdr(struct yaffs_dev *dev)
+{
+       struct yaffs_checkpt_chunk_hdr hdr;
+
+       hdr.version = YAFFS_CHECKPOINT_VERSION;
+       hdr.seq = dev->checkpt_page_seq;
+       hdr.sum = dev->checkpt_sum;
+       hdr.xor = dev->checkpt_xor;
+
+       dev->checkpt_byte_offs = sizeof(hdr);
+
+       memcpy(dev->checkpt_buffer, &hdr, sizeof(hdr));
+}
+
+static int yaffs2_checkpt_check_chunk_hdr(struct yaffs_dev *dev)
 {
-       int blocksAvailable = dev->n_erased_blocks - dev->param.n_reserved_blocks;
+       struct yaffs_checkpt_chunk_hdr hdr;
+
+       memcpy(&hdr, dev->checkpt_buffer, sizeof(hdr));
 
-       T(YAFFS_TRACE_CHECKPOINT,
-               (TSTR("checkpt blocks available = %d" TENDSTR),
-               blocksAvailable));
+       dev->checkpt_byte_offs = sizeof(hdr);
 
-       return (blocksAvailable <= 0) ? 0 : 1;
+       return hdr.version == YAFFS_CHECKPOINT_VERSION &&
+               hdr.seq == dev->checkpt_page_seq &&
+               hdr.sum == dev->checkpt_sum &&
+               hdr.xor == dev->checkpt_xor;
 }
 
+static int yaffs2_checkpt_space_ok(struct yaffs_dev *dev)
+{
+       int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
+
+       yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+               "checkpt blocks_avail = %d", blocks_avail);
 
-static int yaffs_checkpt_erase(yaffs_dev_t *dev)
+       return (blocks_avail <= 0) ? 0 : 1;
+}
+
+static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 {
        int i;
 
-       if (!dev->param.erase_fn)
+       if (!dev->drv.drv_erase_fn)
                return 0;
-       T(YAFFS_TRACE_CHECKPOINT, (TSTR("checking blocks %d to %d"TENDSTR),
-               dev->internal_start_block, dev->internal_end_block));
+       yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+               "checking blocks %d to %d",
+               dev->internal_start_block, dev->internal_end_block);
 
        for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-               yaffs_block_info_t *bi = yaffs_get_block_info(dev, i);
+               struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
+               int offset_i = apply_block_offset(dev, i);
+               int result;
+
                if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
-                       T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
+                       yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+                       "erasing checkpt block %d", i);
 
                        dev->n_erasures++;
 
-                       if (dev->param.erase_fn(dev, i - dev->block_offset /* realign */)) {
+                       result = dev->drv.drv_erase_fn(dev, offset_i);
+                       if(result) {
                                bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
                                dev->n_erased_blocks++;
-                               dev->n_free_chunks += dev->param.chunks_per_block;
+                               dev->n_free_chunks +=
+                                   dev->param.chunks_per_block;
                        } else {
-                               dev->param.bad_block_fn(dev, i);
+                               dev->drv.drv_mark_bad_fn(dev, offset_i);
                                bi->block_state = YAFFS_BLOCK_STATE_DEAD;
                        }
                }
@@ -58,93 +109,112 @@ static int yaffs_checkpt_erase(yaffs_dev_t *dev)
        return 1;
 }
 
-
-static void yaffs2_checkpt_find_erased_block(yaffs_dev_t *dev)
+static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
 {
-       int  i;
-       int blocksAvailable = dev->n_erased_blocks - dev->param.n_reserved_blocks;
-       T(YAFFS_TRACE_CHECKPOINT,
-               (TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
-               dev->n_erased_blocks, dev->param.n_reserved_blocks, blocksAvailable, dev->checkpt_next_block));
+       int i;
+       int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
+
+       yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+               "allocating checkpt block: erased %d reserved %d avail %d next %d ",
+               dev->n_erased_blocks, dev->param.n_reserved_blocks,
+               blocks_avail, dev->checkpt_next_block);
 
        if (dev->checkpt_next_block >= 0 &&
-                       dev->checkpt_next_block <= dev->internal_end_block &&
-                       blocksAvailable > 0) {
+           dev->checkpt_next_block <= dev->internal_end_block &&
+           blocks_avail > 0) {
 
-               for (i = dev->checkpt_next_block; i <= dev->internal_end_block; i++) {
-                       yaffs_block_info_t *bi = yaffs_get_block_info(dev, i);
+               for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
+                    i++) {
+                       struct yaffs_block_info *bi;
+
+                       bi = yaffs_get_block_info(dev, i);
                        if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
                                dev->checkpt_next_block = i + 1;
                                dev->checkpt_cur_block = i;
-                               T(YAFFS_TRACE_CHECKPOINT, (TSTR("allocating checkpt block %d"TENDSTR), i));
+                               yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+                                       "allocating checkpt block %d", i);
                                return;
                        }
                }
        }
-       T(YAFFS_TRACE_CHECKPOINT, (TSTR("out of checkpt blocks"TENDSTR)));
+       yaffs_trace(YAFFS_TRACE_CHECKPOINT, "out of checkpt blocks");
 
        dev->checkpt_next_block = -1;
        dev->checkpt_cur_block = -1;
 }
 
-static void yaffs2_checkpt_find_block(yaffs_dev_t *dev)
+static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 {
-       int  i;
-       yaffs_ext_tags tags;
+       int i;
+       struct yaffs_ext_tags tags;
 
-       T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
-               dev->blocks_in_checkpt, dev->checkpt_next_block));
+       yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+               "find next checkpt block: start:  blocks %d next %d",
+               dev->blocks_in_checkpt, dev->checkpt_next_block);
 
        if (dev->blocks_in_checkpt < dev->checkpt_max_blocks)
-               for (i = dev->checkpt_next_block; i <= dev->internal_end_block; i++) {
+               for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
+                    i++) {
                        int chunk = i * dev->param.chunks_per_block;
-                       int realignedChunk = chunk - dev->chunk_offset;
+                       enum yaffs_block_state state;
+                       u32 seq;
 
-                       dev->param.read_chunk_tags_fn(dev, realignedChunk,
+                       dev->tagger.read_chunk_tags_fn(dev,
+                                       apply_chunk_offset(dev, chunk),
                                        NULL, &tags);
-                       T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
-                               i, tags.obj_id, tags.seq_number, tags.ecc_result));
-
-                       if (tags.seq_number == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
-                               /* Right kind of block */
-                               dev->checkpt_next_block = tags.obj_id;
-                               dev->checkpt_cur_block = i;
-                               dev->checkpt_block_list[dev->blocks_in_checkpt] = i;
-                               dev->blocks_in_checkpt++;
-                               T(YAFFS_TRACE_CHECKPOINT, (TSTR("found checkpt block %d"TENDSTR), i));
-                               return;
-                       }
+                       yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+                               "find next checkpt block: search: block %d state %d oid %d seq %d eccr %d",
+                               i, (int) state,
+                               tags.obj_id, tags.seq_number,
+                               tags.ecc_result);
+
+                       if (tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
+                               continue;
+
+                       dev->tagger.query_block_fn(dev,
+                                               apply_block_offset(dev, i),
+                                               &state, &seq);
+                       if (state == YAFFS_BLOCK_STATE_DEAD)
+                               continue;
+
+                       /* Right kind of block */
+                       dev->checkpt_next_block = tags.obj_id;
+                       dev->checkpt_cur_block = i;
+                       dev->checkpt_block_list[dev->blocks_in_checkpt] = i;
+                       dev->blocks_in_checkpt++;
+                       yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+                               "found checkpt block %d", i);
+                       return;
                }
 
-       T(YAFFS_TRACE_CHECKPOINT, (TSTR("found no more checkpt blocks"TENDSTR)));
+       yaffs_trace(YAFFS_TRACE_CHECKPOINT, "found no more checkpt blocks");
 
        dev->checkpt_next_block = -1;
        dev->checkpt_cur_block = -1;
 }
 
-
-int yaffs2_checkpt_open(yaffs_dev_t *dev, int forWriting)
+int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
 {
+       int i;
 
-
-       dev->checkpt_open_write = forWriting;
+       dev->checkpt_open_write = writing;
 
        /* Got the functions we need? */
-       if (!dev->param.write_chunk_tags_fn ||
-               !dev->param.read_chunk_tags_fn ||
-               !dev->param.erase_fn ||
-               !dev->param.bad_block_fn)
+       if (!dev->tagger.write_chunk_tags_fn ||
+           !dev->tagger.read_chunk_tags_fn ||
+           !dev->drv.drv_erase_fn ||
+           !dev->drv.drv_mark_bad_fn)
                return 0;
 
-       if (forWriting && !yaffs2_checkpt_space_ok(dev))
+       if (writing && !yaffs2_checkpt_space_ok(dev))
                return 0;
 
        if (!dev->checkpt_buffer)
-               dev->checkpt_buffer = YMALLOC_DMA(dev->param.total_bytes_per_chunk);
+               dev->checkpt_buffer =
+                   kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS);
        if (!dev->checkpt_buffer)
                return 0;
 
-
        dev->checkpt_page_seq = 0;
        dev->checkpt_byte_count = 0;
        dev->checkpt_sum = 0;
@@ -153,44 +223,46 @@ int yaffs2_checkpt_open(yaffs_dev_t *dev, int forWriting)
        dev->checkpt_cur_chunk = -1;
        dev->checkpt_next_block = dev->internal_start_block;
 
-       /* Erase all the blocks in the checkpoint area */
-       if (forWriting) {
+       if (writing) {
                memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
-               dev->checkpt_byte_offs = 0;
+               yaffs2_checkpt_init_chunk_hdr(dev);
                return yaffs_checkpt_erase(dev);
-       } else {
-               int i;
-               /* Set to a value that will kick off a read */
-               dev->checkpt_byte_offs = dev->data_bytes_per_chunk;
-               /* A checkpoint block list of 1 checkpoint block per 16 block is (hopefully)
-                * going to be way more than we need */
-               dev->blocks_in_checkpt = 0;
-               dev->checkpt_max_blocks = (dev->internal_end_block - dev->internal_start_block)/16 + 2;
-               dev->checkpt_block_list = YMALLOC(sizeof(int) * dev->checkpt_max_blocks);
-               if(!dev->checkpt_block_list)
-                       return 0;
-
-               for (i = 0; i < dev->checkpt_max_blocks; i++)
-                       dev->checkpt_block_list[i] = -1;
        }
 
+       /* Opening for a read */
+       /* Set to a value that will kick off a read */
+       dev->checkpt_byte_offs = dev->data_bytes_per_chunk;
+       /* A checkpoint block list of 1 checkpoint block per 16 block is
+        * (hopefully) going to be way more than we need */
+       dev->blocks_in_checkpt = 0;
+       dev->checkpt_max_blocks =
+           (dev->internal_end_block - dev->internal_start_block) / 16 + 2;
+       dev->checkpt_block_list =
+           kmalloc(sizeof(int) * dev->checkpt_max_blocks, GFP_NOFS);
+
+       if (!dev->checkpt_block_list)
+               return 0;
+
+       for (i = 0; i < dev->checkpt_max_blocks; i++)
+               dev->checkpt_block_list[i] = -1;
+
        return 1;
 }
 
-int yaffs2_get_checkpt_sum(yaffs_dev_t *dev, __u32 *sum)
+int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum)
 {
-       __u32 compositeSum;
-       compositeSum =  (dev->checkpt_sum << 8) | (dev->checkpt_xor & 0xFF);
-       *sum = compositeSum;
+       u32 composite_sum;
+
+       composite_sum = (dev->checkpt_sum << 8) | (dev->checkpt_xor & 0xff);
+       *sum = composite_sum;
        return 1;
 }
 
-static int yaffs2_checkpt_flush_buffer(yaffs_dev_t *dev)
+static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
 {
        int chunk;
-       int realignedChunk;
-
-       yaffs_ext_tags tags;
+       int offset_chunk;
+       struct yaffs_ext_tags tags;
 
        if (dev->checkpt_cur_block < 0) {
                yaffs2_checkpt_find_erased_block(dev);
@@ -201,31 +273,34 @@ static int yaffs2_checkpt_flush_buffer(yaffs_dev_t *dev)
                return 0;
 
        tags.is_deleted = 0;
-       tags.obj_id = dev->checkpt_next_block; /* Hint to next place to look */
+       tags.obj_id = dev->checkpt_next_block;  /* Hint to next place to look */
        tags.chunk_id = dev->checkpt_page_seq + 1;
-       tags.seq_number =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
+       tags.seq_number = YAFFS_SEQUENCE_CHECKPOINT_DATA;
        tags.n_bytes = dev->data_bytes_per_chunk;
        if (dev->checkpt_cur_chunk == 0) {
                /* First chunk we write for the block? Set block state to
                   checkpoint */
-               yaffs_block_info_t *bi = yaffs_get_block_info(dev, dev->checkpt_cur_block);
+               struct yaffs_block_info *bi =
+                   yaffs_get_block_info(dev, dev->checkpt_cur_block);
                bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
                dev->blocks_in_checkpt++;
        }
 
-       chunk = dev->checkpt_cur_block * dev->param.chunks_per_block + dev->checkpt_cur_chunk;
-
+       chunk =
+           dev->checkpt_cur_block * dev->param.chunks_per_block +
+           dev->checkpt_cur_chunk;
 
-       T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
-               chunk, dev->checkpt_cur_block, dev->checkpt_cur_chunk, tags.obj_id, tags.chunk_id));
+       yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+               "checkpoint wite buffer nand %d(%d:%d) objid %d chId %d",
+               chunk, dev->checkpt_cur_block, dev->checkpt_cur_chunk,
+               tags.obj_id, tags.chunk_id);
 
-       realignedChunk = chunk - dev->chunk_offset;
+       offset_chunk = apply_chunk_offset(dev, chunk);
 
        dev->n_page_writes++;
 
-       dev->param.write_chunk_tags_fn(dev, realignedChunk,
-                       dev->checkpt_buffer, &tags);
-       dev->checkpt_byte_offs = 0;
+       dev->tagger.write_chunk_tags_fn(dev, offset_chunk,
+                                      dev->checkpt_buffer, &tags);
        dev->checkpt_page_seq++;
        dev->checkpt_cur_chunk++;
        if (dev->checkpt_cur_chunk >= dev->param.chunks_per_block) {
@@ -234,19 +309,17 @@ static int yaffs2_checkpt_flush_buffer(yaffs_dev_t *dev)
        }
        memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
 
+       yaffs2_checkpt_init_chunk_hdr(dev);
+
+
        return 1;
 }
 
-
-int yaffs2_checkpt_wr(yaffs_dev_t *dev, const void *data, int n_bytes)
+int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
 {
        int i = 0;
        int ok = 1;
-
-
-       __u8 * dataBytes = (__u8 *)data;
-
-
+       u8 *data_bytes = (u8 *) data;
 
        if (!dev->checkpt_buffer)
                return 0;
@@ -255,35 +328,31 @@ int yaffs2_checkpt_wr(yaffs_dev_t *dev, const void *data, int n_bytes)
                return -1;
 
        while (i < n_bytes && ok) {
-               dev->checkpt_buffer[dev->checkpt_byte_offs] = *dataBytes;
-               dev->checkpt_sum += *dataBytes;
-               dev->checkpt_xor ^= *dataBytes;
+               dev->checkpt_buffer[dev->checkpt_byte_offs] = *data_bytes;
+               dev->checkpt_sum += *data_bytes;
+               dev->checkpt_xor ^= *data_bytes;
 
                dev->checkpt_byte_offs++;
                i++;
-               dataBytes++;
+               data_bytes++;
                dev->checkpt_byte_count++;
 
-
                if (dev->checkpt_byte_offs < 0 ||
-                  dev->checkpt_byte_offs >= dev->data_bytes_per_chunk)
+                   dev->checkpt_byte_offs >= dev->data_bytes_per_chunk)
                        ok = yaffs2_checkpt_flush_buffer(dev);
        }
 
        return i;
 }
 
-int yaffs2_checkpt_rd(yaffs_dev_t *dev, void *data, int n_bytes)
+int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 {
        int i = 0;
        int ok = 1;
-       yaffs_ext_tags tags;
-
-
+       struct yaffs_ext_tags tags;
        int chunk;
-       int realignedChunk;
-
-       __u8 *dataBytes = (__u8 *)data;
+       int offset_chunk;
+       u8 *data_bytes = (u8 *) data;
 
        if (!dev->checkpt_buffer)
                return 0;
@@ -293,109 +362,113 @@ int yaffs2_checkpt_rd(yaffs_dev_t *dev, void *data, int n_bytes)
 
        while (i < n_bytes && ok) {
 
-
                if (dev->checkpt_byte_offs < 0 ||
-                       dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
+                   dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
 
                        if (dev->checkpt_cur_block < 0) {
                                yaffs2_checkpt_find_block(dev);
                                dev->checkpt_cur_chunk = 0;
                        }
 
-                       if (dev->checkpt_cur_block < 0)
+                       if (dev->checkpt_cur_block < 0) {
                                ok = 0;
-                       else {
-                               chunk = dev->checkpt_cur_block *
-                                       dev->param.chunks_per_block +
-                                       dev->checkpt_cur_chunk;
-
-                               realignedChunk = chunk - dev->chunk_offset;
-                               
-                               dev->n_page_reads++;
-
-                               /* read in the next chunk */
-                               /* printf("read checkpoint page %d\n",dev->checkpointPage); */
-                               dev->param.read_chunk_tags_fn(dev,
-                                               realignedChunk,
+                               break;
+                       }
+
+                       chunk = dev->checkpt_cur_block *
+                           dev->param.chunks_per_block +
+                           dev->checkpt_cur_chunk;
+
+                       offset_chunk = apply_chunk_offset(dev, chunk);
+                       dev->n_page_reads++;
+
+                       /* read in the next chunk */
+                       dev->tagger.read_chunk_tags_fn(dev,
+                                               offset_chunk,
                                                dev->checkpt_buffer,
                                                &tags);
 
-                               if (tags.chunk_id != (dev->checkpt_page_seq + 1) ||
-                                       tags.ecc_result > YAFFS_ECC_RESULT_FIXED ||
-                                       tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
-                                       ok = 0;
+                       if (tags.chunk_id != (dev->checkpt_page_seq + 1) ||
+                           tags.ecc_result > YAFFS_ECC_RESULT_FIXED ||
+                           tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA) {
+                               ok = 0;
+                               break;
+                       }
+                       if(!yaffs2_checkpt_check_chunk_hdr(dev)) {
+                               ok = 0;
+                               break;
+                       }
 
-                               dev->checkpt_byte_offs = 0;
-                               dev->checkpt_page_seq++;
-                               dev->checkpt_cur_chunk++;
+                       dev->checkpt_page_seq++;
+                       dev->checkpt_cur_chunk++;
 
-                               if (dev->checkpt_cur_chunk >= dev->param.chunks_per_block)
-                                       dev->checkpt_cur_block = -1;
-                       }
-               }
+                       if (dev->checkpt_cur_chunk >=
+                                       dev->param.chunks_per_block)
+                               dev->checkpt_cur_block = -1;
 
-               if (ok) {
-                       *dataBytes = dev->checkpt_buffer[dev->checkpt_byte_offs];
-                       dev->checkpt_sum += *dataBytes;
-                       dev->checkpt_xor ^= *dataBytes;
-                       dev->checkpt_byte_offs++;
-                       i++;
-                       dataBytes++;
-                       dev->checkpt_byte_count++;
                }
+
+               *data_bytes = dev->checkpt_buffer[dev->checkpt_byte_offs];
+               dev->checkpt_sum += *data_bytes;
+               dev->checkpt_xor ^= *data_bytes;
+               dev->checkpt_byte_offs++;
+               i++;
+               data_bytes++;
+               dev->checkpt_byte_count++;
        }
 
-       return  i;
+       return i;
 }
 
-int yaffs_checkpt_close(yaffs_dev_t *dev)
+int yaffs_checkpt_close(struct yaffs_dev *dev)
 {
+       int i;
 
        if (dev->checkpt_open_write) {
-               if (dev->checkpt_byte_offs != 0)
+               if (dev->checkpt_byte_offs !=
+                       sizeof(sizeof(struct yaffs_checkpt_chunk_hdr)))
                        yaffs2_checkpt_flush_buffer(dev);
-       } else if(dev->checkpt_block_list){
-               int i;
-               for (i = 0; i < dev->blocks_in_checkpt && dev->checkpt_block_list[i] >= 0; i++) {
+       } else if (dev->checkpt_block_list) {
+               for (i = 0;
+                    i < dev->blocks_in_checkpt &&
+                    dev->checkpt_block_list[i] >= 0; i++) {
                        int blk = dev->checkpt_block_list[i];
-                       yaffs_block_info_t *bi = NULL;
-                       if( dev->internal_start_block <= blk && blk <= dev->internal_end_block)
+                       struct yaffs_block_info *bi = NULL;
+
+                       if (dev->internal_start_block <= blk &&
+                           blk <= dev->internal_end_block)
                                bi = yaffs_get_block_info(dev, blk);
                        if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY)
                                bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
-                       else {
-                               /* Todo this looks odd... */
-                       }
                }
-               YFREE(dev->checkpt_block_list);
+               kfree(dev->checkpt_block_list);
                dev->checkpt_block_list = NULL;
        }
 
-       dev->n_free_chunks -= dev->blocks_in_checkpt * dev->param.chunks_per_block;
+       dev->n_free_chunks -=
+               dev->blocks_in_checkpt * dev->param.chunks_per_block;
        dev->n_erased_blocks -= dev->blocks_in_checkpt;
 
-
-       T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint byte count %d" TENDSTR),
-                       dev->checkpt_byte_count));
+       yaffs_trace(YAFFS_TRACE_CHECKPOINT, "checkpoint byte count %d",
+               dev->checkpt_byte_count);
 
        if (dev->checkpt_buffer) {
                /* free the buffer */
-               YFREE(dev->checkpt_buffer);
+               kfree(dev->checkpt_buffer);
                dev->checkpt_buffer = NULL;
                return 1;
-       } else
+       } else {
                return 0;
+       }
 }
 
-int yaffs2_checkpt_invalidate_stream(yaffs_dev_t *dev)
+int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev)
 {
        /* Erase the checkpoint data */
 
-       T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint invalidate of %d blocks"TENDSTR),
-               dev->blocks_in_checkpt));
+       yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+               "checkpoint invalidate of %d blocks",
+               dev->blocks_in_checkpt);
 
        return yaffs_checkpt_erase(dev);
 }
-
-
-
index 059ba9e..cdbaba7 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
 
 #include "yaffs_guts.h"
 
-int yaffs2_checkpt_open(yaffs_dev_t *dev, int forWriting);
+int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing);
 
-int yaffs2_checkpt_wr(yaffs_dev_t *dev, const void *data, int n_bytes);
+int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes);
 
-int yaffs2_checkpt_rd(yaffs_dev_t *dev, void *data, int n_bytes);
+int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes);
 
-int yaffs2_get_checkpt_sum(yaffs_dev_t *dev, __u32 *sum);
+int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum);
 
-int yaffs_checkpt_close(yaffs_dev_t *dev);
-
-int yaffs2_checkpt_invalidate_stream(yaffs_dev_t *dev);
+int yaffs_checkpt_close(struct yaffs_dev *dev);
 
+int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev);
 
 #endif
index 4030908..9294107 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
  * The two unused bit are set to 1.
- * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
- * blocks are used on a 512-byte NAND page.
+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two
+ * such ECC blocks are used on a 512-byte NAND page.
  *
  */
 
+#include "yportenv.h"
+
+#include "yaffs_ecc.h"
+
 /* Table generated by gen-ecc.c
  * Using a table means we do not have to calculate p1..p4 and p1'..p4'
  * for each byte of data. These are instead provided in a table in bits7..2.
- * Bit 0 of each entry indicates whether the entry has an odd or even parity, and therefore
- * this bytes influence on the line parity.
+ * Bit 0 of each entry indicates whether the entry has an odd or even parity,
+ * and therefore this bytes influence on the line parity.
  */
 
-#include "yportenv.h"
-
-#include "yaffs_ecc.h"
-
 static const unsigned char column_parity_table[] = {
        0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
        0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
@@ -67,35 +67,11 @@ static const unsigned char column_parity_table[] = {
        0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
 };
 
-/* Count the bits in an unsigned char or a U32 */
-
-static int yaffs_count_bits(unsigned char x)
-{
-       int r = 0;
-       while (x) {
-               if (x & 1)
-                       r++;
-               x >>= 1;
-       }
-       return r;
-}
-
-static int yaffs_count_bits32(unsigned x)
-{
-       int r = 0;
-       while (x) {
-               if (x & 1)
-                       r++;
-               x >>= 1;
-       }
-       return r;
-}
 
 /* Calculate the ECC for a 256-byte block of data */
-void yaffs_ecc_cacl(const unsigned char *data, unsigned char *ecc)
+void yaffs_ecc_calc(const unsigned char *data, unsigned char *ecc)
 {
        unsigned int i;
-
        unsigned char col_parity = 0;
        unsigned char line_parity = 0;
        unsigned char line_parity_prime = 0;
@@ -106,7 +82,7 @@ void yaffs_ecc_cacl(const unsigned char *data, unsigned char *ecc)
                b = column_parity_table[*data++];
                col_parity ^= b;
 
-               if (b & 0x01) {         /* odd number of bits in the byte */
+               if (b & 0x01) { /* odd number of bits in the byte */
                        line_parity ^= i;
                        line_parity_prime ^= ~i;
                }
@@ -152,19 +128,12 @@ void yaffs_ecc_cacl(const unsigned char *data, unsigned char *ecc)
                t |= 0x01;
        ecc[0] = ~t;
 
-#ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
-       /* Swap the bytes into the wrong order */
-       t = ecc[0];
-       ecc[0] = ecc[1];
-       ecc[1] = t;
-#endif
 }
 
-
 /* Correct the ECC on a 256 byte block of data */
 
 int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
-                    const unsigned char *test_ecc)
+                     const unsigned char *test_ecc)
 {
        unsigned char d0, d1, d2;       /* deltas */
 
@@ -173,7 +142,7 @@ int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
        d2 = read_ecc[2] ^ test_ecc[2];
 
        if ((d0 | d1 | d2) == 0)
-               return 0; /* no error */
+               return 0;       /* no error */
 
        if (((d0 ^ (d0 >> 1)) & 0x55) == 0x55 &&
            ((d1 ^ (d1 >> 1)) & 0x55) == 0x55 &&
@@ -183,15 +152,6 @@ int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
                unsigned byte;
                unsigned bit;
 
-#ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
-               /* swap the bytes to correct for the wrong order */
-               unsigned char t;
-
-               t = d0;
-               d0 = d1;
-               d1 = t;
-#endif
-
                bit = byte = 0;
 
                if (d1 & 0x80)
@@ -220,19 +180,17 @@ int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
 
                data[byte] ^= (1 << bit);
 
-               return 1; /* Corrected the error */
+               return 1;       /* Corrected the error */
        }
 
-       if ((yaffs_count_bits(d0) +
-            yaffs_count_bits(d1) +
-            yaffs_count_bits(d2)) ==  1) {
+       if ((hweight8(d0) + hweight8(d1) + hweight8(d2)) == 1) {
                /* Reccoverable error in ecc */
 
                read_ecc[0] = test_ecc[0];
                read_ecc[1] = test_ecc[1];
                read_ecc[2] = test_ecc[2];
 
-               return 1; /* Corrected the error */
+               return 1;       /* Corrected the error */
        }
 
        /* Unrecoverable error */
@@ -241,15 +199,13 @@ int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
 
 }
 
-
 /*
  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
  */
 void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
-                               yaffs_ECCOther *eccOther)
+                         struct yaffs_ecc_other *ecc_other)
 {
        unsigned int i;
-
        unsigned char col_parity = 0;
        unsigned line_parity = 0;
        unsigned line_parity_prime = 0;
@@ -259,7 +215,7 @@ void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
                b = column_parity_table[*data++];
                col_parity ^= b;
 
-               if (b & 0x01)    {
+               if (b & 0x01) {
                        /* odd number of bits in the byte */
                        line_parity ^= i;
                        line_parity_prime ^= ~i;
@@ -267,54 +223,56 @@ void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
 
        }
 
-       eccOther->colParity = (col_parity >> 2) & 0x3f;
-       eccOther->lineParity = line_parity;
-       eccOther->lineParityPrime = line_parity_prime;
+       ecc_other->col_parity = (col_parity >> 2) & 0x3f;
+       ecc_other->line_parity = line_parity;
+       ecc_other->line_parity_prime = line_parity_prime;
 }
 
 int yaffs_ecc_correct_other(unsigned char *data, unsigned n_bytes,
-                       yaffs_ECCOther *read_ecc,
-                       const yaffs_ECCOther *test_ecc)
+                           struct yaffs_ecc_other *read_ecc,
+                           const struct yaffs_ecc_other *test_ecc)
 {
-       unsigned char cDelta;   /* column parity delta */
-       unsigned lDelta;        /* line parity delta */
-       unsigned lDeltaPrime;   /* line parity delta */
+       unsigned char delta_col;        /* column parity delta */
+       unsigned delta_line;    /* line parity delta */
+       unsigned delta_line_prime;      /* line parity delta */
        unsigned bit;
 
-       cDelta = read_ecc->colParity ^ test_ecc->colParity;
-       lDelta = read_ecc->lineParity ^ test_ecc->lineParity;
-       lDeltaPrime = read_ecc->lineParityPrime ^ test_ecc->lineParityPrime;
+       delta_col = read_ecc->col_parity ^ test_ecc->col_parity;
+       delta_line = read_ecc->line_parity ^ test_ecc->line_parity;
+       delta_line_prime =
+           read_ecc->line_parity_prime ^ test_ecc->line_parity_prime;
 
-       if ((cDelta | lDelta | lDeltaPrime) == 0)
-               return 0; /* no error */
+       if ((delta_col | delta_line | delta_line_prime) == 0)
+               return 0;       /* no error */
 
-       if (lDelta == ~lDeltaPrime &&
-           (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
+       if (delta_line == ~delta_line_prime &&
+           (((delta_col ^ (delta_col >> 1)) & 0x15) == 0x15)) {
                /* Single bit (recoverable) error in data */
 
                bit = 0;
 
-               if (cDelta & 0x20)
+               if (delta_col & 0x20)
                        bit |= 0x04;
-               if (cDelta & 0x08)
+               if (delta_col & 0x08)
                        bit |= 0x02;
-               if (cDelta & 0x02)
+               if (delta_col & 0x02)
                        bit |= 0x01;
 
-               if (lDelta >= n_bytes)
+               if (delta_line >= n_bytes)
                        return -1;
 
-               data[lDelta] ^= (1 << bit);
+               data[delta_line] ^= (1 << bit);
 
-               return 1; /* corrected */
+               return 1;       /* corrected */
        }
 
-       if ((yaffs_count_bits32(lDelta) + yaffs_count_bits32(lDeltaPrime) +
-                       yaffs_count_bits(cDelta)) == 1) {
+       if ((hweight32(delta_line) +
+            hweight32(delta_line_prime) +
+            hweight8(delta_col)) == 1) {
                /* Reccoverable error in ecc */
 
                *read_ecc = *test_ecc;
-               return 1; /* corrected */
+               return 1;       /* corrected */
        }
 
        /* Unrecoverable error */
index 124e5a0..17d47bd 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes.
  * The two unused bit are set to 1.
- * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC
- * blocks are used on a 512-byte NAND page.
+ * The ECC can correct single bit errors in a 256-byte page of data.
+ * Thus, two such ECC blocks are used on a 512-byte NAND page.
  *
  */
 
 #ifndef __YAFFS_ECC_H__
 #define __YAFFS_ECC_H__
 
-typedef struct {
-       unsigned char colParity;
-       unsigned lineParity;
-       unsigned lineParityPrime;
-} yaffs_ECCOther;
+struct yaffs_ecc_other {
+       unsigned char col_parity;
+       unsigned line_parity;
+       unsigned line_parity_prime;
+};
 
-void yaffs_ecc_cacl(const unsigned char *data, unsigned char *ecc);
+void yaffs_ecc_calc(const unsigned char *data, unsigned char *ecc);
 int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
-               const unsigned char *test_ecc);
+                     const unsigned char *test_ecc);
 
 void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
-                       yaffs_ECCOther *ecc);
+                         struct yaffs_ecc_other *ecc);
 int yaffs_ecc_correct_other(unsigned char *data, unsigned n_bytes,
-                       yaffs_ECCOther *read_ecc,
-                       const yaffs_ECCOther *test_ecc);
+                           struct yaffs_ecc_other *read_ecc,
+                           const struct yaffs_ecc_other *test_ecc);
 #endif
index 432441b..8fd0802 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
 #include "yaffs_trace.h"
 
 /* Function to manipulate block info */
-static Y_INLINE yaffs_block_info_t *yaffs_get_block_info(yaffs_dev_t * dev, int blk)
+static inline struct yaffs_block_info *yaffs_get_block_info(struct yaffs_dev
+                                                             *dev, int blk)
 {
        if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
-               T(YAFFS_TRACE_ERROR,
-                 (TSTR
-                  ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
-                  blk));
-               YBUG();
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "**>> yaffs: get_block_info block %d is not valid",
+                       blk);
+               BUG();
        }
        return &dev->block_info[blk - dev->internal_start_block];
 }
index 36e11f5..1fd464d 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+
 #include "yportenv.h"
 #include "yaffs_trace.h"
 
-#include "yaffsinterface.h"
 #include "yaffs_guts.h"
-#include "yaffs_tagsvalidity.h"
 #include "yaffs_getblockinfo.h"
-
 #include "yaffs_tagscompat.h"
-
+#include "yaffs_tagsmarshall.h"
 #include "yaffs_nand.h"
-
 #include "yaffs_yaffs1.h"
 #include "yaffs_yaffs2.h"
 #include "yaffs_bitmap.h"
 #include "yaffs_verify.h"
-
 #include "yaffs_nand.h"
 #include "yaffs_packedtags2.h"
-
 #include "yaffs_nameval.h"
 #include "yaffs_allocator.h"
+#include "yaffs_attribs.h"
+#include "yaffs_summary.h"
 
 /* Note YAFFS_GC_GOOD_ENOUGH must be <= YAFFS_GC_PASSIVE_THRESHOLD */
 #define YAFFS_GC_GOOD_ENOUGH 2
 
 #include "yaffs_ecc.h"
 
+/* Forward declarations */
 
+static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk,
+                            const u8 *buffer, int n_bytes, int use_reserve);
 
-/* Robustification (if it ever comes about...) */
-static void yaffs_retire_block(yaffs_dev_t *dev, int flash_block);
-static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk,
-               int erasedOk);
-static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk,
-                               const __u8 *data,
-                               const yaffs_ext_tags *tags);
-static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk,
-                               const yaffs_ext_tags *tags);
-
-/* Other local prototypes */
-static void yaffs_update_parent(yaffs_obj_t *obj);
-static int yaffs_unlink_obj(yaffs_obj_t *obj);
-static int yaffs_obj_cache_dirty(yaffs_obj_t *obj);
-
-static int yaffs_write_new_chunk(yaffs_dev_t *dev,
-                                       const __u8 *buffer,
-                                       yaffs_ext_tags *tags,
-                                       int useReserve);
-
-
-static yaffs_obj_t *yaffs_new_obj(yaffs_dev_t *dev, int number,
-                                       yaffs_obj_type type);
-
-
-static int yaffs_apply_xattrib_mod(yaffs_obj_t *obj, char *buffer, yaffs_xattr_mod *xmod);
-
-static void yaffs_remove_obj_from_dir(yaffs_obj_t *obj);
-static int yaffs_check_structures(void);
-static int yaffs_generic_obj_del(yaffs_obj_t *in);
-
-static int yaffs_check_chunk_erased(struct yaffs_dev_s *dev,
-                               int nand_chunk);
-
-static int yaffs_unlink_worker(yaffs_obj_t *obj);
-
-static int yaffs_tags_match(const yaffs_ext_tags *tags, int obj_id,
-                       int chunkInObject);
-
-static int yaffs_alloc_chunk(yaffs_dev_t *dev, int useReserve,
-                               yaffs_block_info_t **blockUsedPtr);
-
-static void yaffs_check_obj_details_loaded(yaffs_obj_t *in);
-
-static void yaffs_invalidate_whole_cache(yaffs_obj_t *in);
-static void yaffs_invalidate_chunk_cache(yaffs_obj_t *object, int chunk_id);
-
-static int yaffs_find_chunk_in_file(yaffs_obj_t *in, int inode_chunk,
-                               yaffs_ext_tags *tags);
-
-static int yaffs_verify_chunk_written(yaffs_dev_t *dev,
-                                       int nand_chunk,
-                                       const __u8 *data,
-                                       yaffs_ext_tags *tags);
-
-
-static void yaffs_load_name_from_oh(yaffs_dev_t *dev,YCHAR *name, const YCHAR *ohName, int bufferSize);
-static void yaffs_load_oh_from_name(yaffs_dev_t *dev,YCHAR *ohName, const YCHAR *name);
-
+static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR *name,
+                               int buffer_size);
 
 /* Function to calculate chunk and offset */
 
-static void yaffs_addr_to_chunk(yaffs_dev_t *dev, loff_t addr, int *chunkOut,
-               __u32 *offsetOut)
+void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr,
+                               int *chunk_out, u32 *offset_out)
 {
        int chunk;
-       __u32 offset;
+       u32 offset;
 
-       chunk  = (__u32)(addr >> dev->chunk_shift);
+       chunk = (u32) (addr >> dev->chunk_shift);
 
        if (dev->chunk_div == 1) {
                /* easy power of 2 case */
-               offset = (__u32)(addr & dev->chunk_mask);
+               offset = (u32) (addr & dev->chunk_mask);
        } else {
                /* Non power-of-2 case */
 
-               loff_t chunkBase;
+               loff_t chunk_base;
 
                chunk /= dev->chunk_div;
 
-               chunkBase = ((loff_t)chunk) * dev->data_bytes_per_chunk;
-               offset = (__u32)(addr - chunkBase);
+               chunk_base = ((loff_t) chunk) * dev->data_bytes_per_chunk;
+               offset = (u32) (addr - chunk_base);
        }
 
-       *chunkOut = chunk;
-       *offsetOut = offset;
+       *chunk_out = chunk;
+       *offset_out = offset;
 }
 
 /* Function to return the number of shifts for a power of 2 greater than or
@@ -135,110 +78,93 @@ static void yaffs_addr_to_chunk(yaffs_dev_t *dev, loff_t addr, int *chunkOut,
  * be hellishly efficient.
  */
 
-static __u32 ShiftsGE(__u32 x)
+static inline u32 calc_shifts_ceiling(u32 x)
 {
-       int extraBits;
-       int nShifts;
+       int extra_bits;
+       int shifts;
 
-       nShifts = extraBits = 0;
+       shifts = extra_bits = 0;
 
        while (x > 1) {
                if (x & 1)
-                       extraBits++;
+                       extra_bits++;
                x >>= 1;
-               nShifts++;
+               shifts++;
        }
 
-       if (extraBits)
-               nShifts++;
+       if (extra_bits)
+               shifts++;
 
-       return nShifts;
+       return shifts;
 }
 
 /* Function to return the number of shifts to get a 1 in bit 0
  */
 
-static __u32 Shifts(__u32 x)
+static inline u32 calc_shifts(u32 x)
 {
-       __u32 nShifts;
+       u32 shifts;
 
-       nShifts =  0;
+       shifts = 0;
 
        if (!x)
                return 0;
 
-       while (!(x&1)) {
+       while (!(x & 1)) {
                x >>= 1;
-               nShifts++;
+               shifts++;
        }
 
-       return nShifts;
+       return shifts;
 }
 
-
-
 /*
  * Temporary buffer manipulations.
  */
 
-static int yaffs_init_tmp_buffers(yaffs_dev_t *dev)
+static int yaffs_init_tmp_buffers(struct yaffs_dev *dev)
 {
        int i;
-       __u8 *buf = (__u8 *)1;
+       u8 *buf = (u8 *) 1;
 
        memset(dev->temp_buffer, 0, sizeof(dev->temp_buffer));
 
        for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
-               dev->temp_buffer[i].line = 0;   /* not in use */
-               dev->temp_buffer[i].buffer = buf =
-                   YMALLOC_DMA(dev->param.total_bytes_per_chunk);
+               dev->temp_buffer[i].in_use = 0;
+               buf = kmalloc(dev->param.total_bytes_per_chunk, GFP_NOFS);
+               dev->temp_buffer[i].buffer = buf;
        }
 
        return buf ? YAFFS_OK : YAFFS_FAIL;
 }
 
-__u8 *yaffs_get_temp_buffer(yaffs_dev_t *dev, int line_no)
+u8 *yaffs_get_temp_buffer(struct yaffs_dev * dev)
 {
-       int i, j;
+       int i;
 
        dev->temp_in_use++;
        if (dev->temp_in_use > dev->max_temp)
                dev->max_temp = dev->temp_in_use;
 
        for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-               if (dev->temp_buffer[i].line == 0) {
-                       dev->temp_buffer[i].line = line_no;
-                       if ((i + 1) > dev->max_temp) {
-                               dev->max_temp = i + 1;
-                               for (j = 0; j <= i; j++)
-                                       dev->temp_buffer[j].max_line =
-                                           dev->temp_buffer[j].line;
-                       }
-
+               if (dev->temp_buffer[i].in_use == 0) {
+                       dev->temp_buffer[i].in_use = 1;
                        return dev->temp_buffer[i].buffer;
                }
        }
 
-       T(YAFFS_TRACE_BUFFERS,
-         (TSTR("Out of temp buffers at line %d, other held by lines:"),
-          line_no));
-       for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
-               T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->temp_buffer[i].line));
-
-       T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
-
+       yaffs_trace(YAFFS_TRACE_BUFFERS, "Out of temp buffers");
        /*
         * If we got here then we have to allocate an unmanaged one
         * This is not good.
         */
 
        dev->unmanaged_buffer_allocs++;
-       return YMALLOC(dev->data_bytes_per_chunk);
+       return kmalloc(dev->data_bytes_per_chunk, GFP_NOFS);
 
 }
 
-void yaffs_release_temp_buffer(yaffs_dev_t *dev, __u8 *buffer,
-                                   int line_no)
+void yaffs_release_temp_buffer(struct yaffs_dev *dev, u8 *buffer)
 {
        int i;
 
@@ -246,61 +172,94 @@ void yaffs_release_temp_buffer(yaffs_dev_t *dev, __u8 *buffer,
 
        for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
                if (dev->temp_buffer[i].buffer == buffer) {
-                       dev->temp_buffer[i].line = 0;
+                       dev->temp_buffer[i].in_use = 0;
                        return;
                }
        }
 
        if (buffer) {
                /* assume it is an unmanaged one. */
-               T(YAFFS_TRACE_BUFFERS,
-                 (TSTR("Releasing unmanaged temp buffer in line %d" TENDSTR),
-                  line_no));
-               YFREE(buffer);
+               yaffs_trace(YAFFS_TRACE_BUFFERS,
+                       "Releasing unmanaged temp buffer");
+               kfree(buffer);
                dev->unmanaged_buffer_deallocs++;
        }
 
 }
 
 /*
- * Determine if we have a managed buffer.
+ * Functions for robustisizing TODO
+ *
  */
-int yaffs_is_managed_tmp_buffer(yaffs_dev_t *dev, const __u8 *buffer)
+
+static void yaffs_handle_chunk_wr_ok(struct yaffs_dev *dev, int nand_chunk,
+                                    const u8 *data,
+                                    const struct yaffs_ext_tags *tags)
 {
-       int i;
+       (void) dev;
+       (void) nand_chunk;
+       (void) data;
+       (void) tags;
+}
 
-       for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-               if (dev->temp_buffer[i].buffer == buffer)
-                       return 1;
-       }
+static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk,
+                                     const struct yaffs_ext_tags *tags)
+{
+       (void) dev;
+       (void) nand_chunk;
+       (void) tags;
+}
 
-       for (i = 0; i < dev->param.n_caches; i++) {
-               if (dev->cache[i].data == buffer)
-                       return 1;
+void yaffs_handle_chunk_error(struct yaffs_dev *dev,
+                             struct yaffs_block_info *bi)
+{
+       if (!bi->gc_prioritise) {
+               bi->gc_prioritise = 1;
+               dev->has_pending_prioritised_gc = 1;
+               bi->chunk_error_strikes++;
+
+               if (bi->chunk_error_strikes > 3) {
+                       bi->needs_retiring = 1; /* Too many stikes, so retire */
+                       yaffs_trace(YAFFS_TRACE_ALWAYS,
+                               "yaffs: Block struck out");
+
+               }
        }
+}
 
-       if (buffer == dev->checkpt_buffer)
-               return 1;
+static void yaffs_handle_chunk_wr_error(struct yaffs_dev *dev, int nand_chunk,
+                                       int erased_ok)
+{
+       int flash_block = nand_chunk / dev->param.chunks_per_block;
+       struct yaffs_block_info *bi = yaffs_get_block_info(dev, flash_block);
 
-       T(YAFFS_TRACE_ALWAYS,
-               (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-       return 0;
+       yaffs_handle_chunk_error(dev, bi);
+
+       if (erased_ok) {
+               /* Was an actual write failure,
+                * so mark the block for retirement.*/
+               bi->needs_retiring = 1;
+               yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+                 "**>> Block %d needs retiring", flash_block);
+       }
+
+       /* Delete the chunk */
+       yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
+       yaffs_skip_rest_of_block(dev);
 }
 
 /*
  * Verification code
  */
 
-
-
-
 /*
  *  Simple hash function. Needs to have a reasonable spread
  */
 
-static Y_INLINE int yaffs_hash_fn(int n)
+static inline int yaffs_hash_fn(int n)
 {
-       n = abs(n);
+       if (n < 0)
+               n = -n;
        return n % YAFFS_NOBJECT_BUCKETS;
 }
 
@@ -309,38 +268,36 @@ static Y_INLINE int yaffs_hash_fn(int n)
  * Note that root might have a presence in NAND if permissions are set.
  */
 
-yaffs_obj_t *yaffs_root(yaffs_dev_t *dev)
+struct yaffs_obj *yaffs_root(struct yaffs_dev *dev)
 {
        return dev->root_dir;
 }
 
-yaffs_obj_t *yaffs_lost_n_found(yaffs_dev_t *dev)
+struct yaffs_obj *yaffs_lost_n_found(struct yaffs_dev *dev)
 {
        return dev->lost_n_found;
 }
 
-
 /*
  *  Erased NAND checking functions
  */
 
-int yaffs_check_ff(__u8 *buffer, int n_bytes)
+int yaffs_check_ff(u8 *buffer, int n_bytes)
 {
        /* Horrible, slow implementation */
        while (n_bytes--) {
-               if (*buffer != 0xFF)
+               if (*buffer != 0xff)
                        return 0;
                buffer++;
        }
        return 1;
 }
 
-static int yaffs_check_chunk_erased(struct yaffs_dev_s *dev,
-                               int nand_chunk)
+static int yaffs_check_chunk_erased(struct yaffs_dev *dev, int nand_chunk)
 {
        int retval = YAFFS_OK;
-       __u8 *data = yaffs_get_temp_buffer(dev, __LINE__);
-       yaffs_ext_tags tags;
+       u8 *data = yaffs_get_temp_buffer(dev);
+       struct yaffs_ext_tags tags;
        int result;
 
        result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, data, &tags);
@@ -348,57 +305,199 @@ static int yaffs_check_chunk_erased(struct yaffs_dev_s *dev,
        if (tags.ecc_result > YAFFS_ECC_RESULT_NO_ERROR)
                retval = YAFFS_FAIL;
 
-       if (!yaffs_check_ff(data, dev->data_bytes_per_chunk) || tags.chunk_used) {
-               T(YAFFS_TRACE_NANDACCESS,
-                 (TSTR("Chunk %d not erased" TENDSTR), nand_chunk));
+       if (!yaffs_check_ff(data, dev->data_bytes_per_chunk) ||
+               tags.chunk_used) {
+               yaffs_trace(YAFFS_TRACE_NANDACCESS,
+                       "Chunk %d not erased", nand_chunk);
                retval = YAFFS_FAIL;
        }
 
-       yaffs_release_temp_buffer(dev, data, __LINE__);
+       yaffs_release_temp_buffer(dev, data);
 
        return retval;
 
 }
 
-
-static int yaffs_verify_chunk_written(yaffs_dev_t *dev,
-                                       int nand_chunk,
-                                       const __u8 *data,
-                                       yaffs_ext_tags *tags)
+static int yaffs_verify_chunk_written(struct yaffs_dev *dev,
+                                     int nand_chunk,
+                                     const u8 *data,
+                                     struct yaffs_ext_tags *tags)
 {
        int retval = YAFFS_OK;
-       yaffs_ext_tags tempTags;
-       __u8 *buffer = yaffs_get_temp_buffer(dev,__LINE__);
+       struct yaffs_ext_tags temp_tags;
+       u8 *buffer = yaffs_get_temp_buffer(dev);
        int result;
-       
-       result = yaffs_rd_chunk_tags_nand(dev,nand_chunk,buffer,&tempTags);
-       if(memcmp(buffer,data,dev->data_bytes_per_chunk) ||
-               tempTags.obj_id != tags->obj_id ||
-               tempTags.chunk_id  != tags->chunk_id ||
-               tempTags.n_bytes != tags->n_bytes)
+
+       result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, buffer, &temp_tags);
+       if (memcmp(buffer, data, dev->data_bytes_per_chunk) ||
+           temp_tags.obj_id != tags->obj_id ||
+           temp_tags.chunk_id != tags->chunk_id ||
+           temp_tags.n_bytes != tags->n_bytes)
                retval = YAFFS_FAIL;
 
-       yaffs_release_temp_buffer(dev, buffer, __LINE__);
+       yaffs_release_temp_buffer(dev, buffer);
 
        return retval;
 }
 
-static int yaffs_write_new_chunk(struct yaffs_dev_s *dev,
-                                       const __u8 *data,
-                                       yaffs_ext_tags *tags,
-                                       int useReserve)
+
+int yaffs_check_alloc_available(struct yaffs_dev *dev, int n_chunks)
+{
+       int reserved_chunks;
+       int reserved_blocks = dev->param.n_reserved_blocks;
+       int checkpt_blocks;
+
+       checkpt_blocks = yaffs_calc_checkpt_blocks_required(dev);
+
+       reserved_chunks =
+           (reserved_blocks + checkpt_blocks) * dev->param.chunks_per_block;
+
+       return (dev->n_free_chunks > (reserved_chunks + n_chunks));
+}
+
+static int yaffs_find_alloc_block(struct yaffs_dev *dev)
+{
+       int i;
+       struct yaffs_block_info *bi;
+
+       if (dev->n_erased_blocks < 1) {
+               /* Hoosterman we've got a problem.
+                * Can't get space to gc
+                */
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                 "yaffs tragedy: no more erased blocks");
+
+               return -1;
+       }
+
+       /* Find an empty block. */
+
+       for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+               dev->alloc_block_finder++;
+               if (dev->alloc_block_finder < dev->internal_start_block
+                   || dev->alloc_block_finder > dev->internal_end_block) {
+                       dev->alloc_block_finder = dev->internal_start_block;
+               }
+
+               bi = yaffs_get_block_info(dev, dev->alloc_block_finder);
+
+               if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
+                       bi->block_state = YAFFS_BLOCK_STATE_ALLOCATING;
+                       dev->seq_number++;
+                       bi->seq_number = dev->seq_number;
+                       dev->n_erased_blocks--;
+                       yaffs_trace(YAFFS_TRACE_ALLOCATE,
+                         "Allocated block %d, seq  %d, %d left" ,
+                          dev->alloc_block_finder, dev->seq_number,
+                          dev->n_erased_blocks);
+                       return dev->alloc_block_finder;
+               }
+       }
+
+       yaffs_trace(YAFFS_TRACE_ALWAYS,
+               "yaffs tragedy: no more erased blocks, but there should have been %d",
+               dev->n_erased_blocks);
+
+       return -1;
+}
+
+static int yaffs_alloc_chunk(struct yaffs_dev *dev, int use_reserver,
+                            struct yaffs_block_info **block_ptr)
+{
+       int ret_val;
+       struct yaffs_block_info *bi;
+
+       if (dev->alloc_block < 0) {
+               /* Get next block to allocate off */
+               dev->alloc_block = yaffs_find_alloc_block(dev);
+               dev->alloc_page = 0;
+       }
+
+       if (!use_reserver && !yaffs_check_alloc_available(dev, 1)) {
+               /* No space unless we're allowed to use the reserve. */
+               return -1;
+       }
+
+       if (dev->n_erased_blocks < dev->param.n_reserved_blocks
+           && dev->alloc_page == 0)
+               yaffs_trace(YAFFS_TRACE_ALLOCATE, "Allocating reserve");
+
+       /* Next page please.... */
+       if (dev->alloc_block >= 0) {
+               bi = yaffs_get_block_info(dev, dev->alloc_block);
+
+               ret_val = (dev->alloc_block * dev->param.chunks_per_block) +
+                   dev->alloc_page;
+               bi->pages_in_use++;
+               yaffs_set_chunk_bit(dev, dev->alloc_block, dev->alloc_page);
+
+               dev->alloc_page++;
+
+               dev->n_free_chunks--;
+
+               /* If the block is full set the state to full */
+               if (dev->alloc_page >= dev->param.chunks_per_block) {
+                       bi->block_state = YAFFS_BLOCK_STATE_FULL;
+                       dev->alloc_block = -1;
+               }
+
+               if (block_ptr)
+                       *block_ptr = bi;
+
+               return ret_val;
+       }
+
+       yaffs_trace(YAFFS_TRACE_ERROR,
+               "!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!");
+
+       return -1;
+}
+
+static int yaffs_get_erased_chunks(struct yaffs_dev *dev)
+{
+       int n;
+
+       n = dev->n_erased_blocks * dev->param.chunks_per_block;
+
+       if (dev->alloc_block > 0)
+               n += (dev->param.chunks_per_block - dev->alloc_page);
+
+       return n;
+
+}
+
+/*
+ * yaffs_skip_rest_of_block() skips over the rest of the allocation block
+ * if we don't want to write to it.
+ */
+void yaffs_skip_rest_of_block(struct yaffs_dev *dev)
+{
+       struct yaffs_block_info *bi;
+
+       if (dev->alloc_block > 0) {
+               bi = yaffs_get_block_info(dev, dev->alloc_block);
+               if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING) {
+                       bi->block_state = YAFFS_BLOCK_STATE_FULL;
+                       dev->alloc_block = -1;
+               }
+       }
+}
+
+static int yaffs_write_new_chunk(struct yaffs_dev *dev,
+                                const u8 *data,
+                                struct yaffs_ext_tags *tags, int use_reserver)
 {
        int attempts = 0;
-       int writeOk = 0;
+       int write_ok = 0;
        int chunk;
 
        yaffs2_checkpt_invalidate(dev);
 
        do {
-               yaffs_block_info_t *bi = 0;
-               int erasedOk = 0;
+               struct yaffs_block_info *bi = 0;
+               int erased_ok = 0;
 
-               chunk = yaffs_alloc_chunk(dev, useReserve, &bi);
+               chunk = yaffs_alloc_chunk(dev, use_reserver, &bi);
                if (chunk < 0) {
                        /* no space */
                        break;
@@ -410,7 +509,7 @@ static int yaffs_write_new_chunk(struct yaffs_dev_s *dev,
                 *
                 * Check the first page we try to write in a block.
                 * If the check passes then we don't need to check any
-                * more.        If the check fails, we check again...
+                * more.        If the check fails, we check again...
                 * If the block has been erased, we don't need to check.
                 *
                 * However, if the block has been prioritised for gc,
@@ -424,42 +523,42 @@ static int yaffs_write_new_chunk(struct yaffs_dev_s *dev,
                 * lot of checks that are most likely not needed.
                 *
                 * Mods to the above
-                * If an erase check fails or the write fails we skip the 
+                * If an erase check fails or the write fails we skip the
                 * rest of the block.
                 */
 
                /* let's give it a try */
                attempts++;
 
-               if(dev->param.always_check_erased)
+               if (dev->param.always_check_erased)
                        bi->skip_erased_check = 0;
 
                if (!bi->skip_erased_check) {
-                       erasedOk = yaffs_check_chunk_erased(dev, chunk);
-                       if (erasedOk != YAFFS_OK) {
-                               T(YAFFS_TRACE_ERROR,
-                               (TSTR("**>> yaffs chunk %d was not erased"
-                               TENDSTR), chunk));
+                       erased_ok = yaffs_check_chunk_erased(dev, chunk);
+                       if (erased_ok != YAFFS_OK) {
+                               yaffs_trace(YAFFS_TRACE_ERROR,
+                                 "**>> yaffs chunk %d was not erased",
+                                 chunk);
 
                                /* If not erased, delete this one,
                                 * skip rest of block and
                                 * try another chunk */
-                                yaffs_chunk_del(dev,chunk,1,__LINE__);
-                                yaffs_skip_rest_of_block(dev);
+                               yaffs_chunk_del(dev, chunk, 1, __LINE__);
+                               yaffs_skip_rest_of_block(dev);
                                continue;
                        }
                }
 
-               writeOk = yaffs_wr_chunk_tags_nand(dev, chunk,
-                               data, tags);
+               write_ok = yaffs_wr_chunk_tags_nand(dev, chunk, data, tags);
 
-               if(!bi->skip_erased_check)
-                       writeOk = yaffs_verify_chunk_written(dev, chunk, data, tags);
+               if (!bi->skip_erased_check)
+                       write_ok =
+                           yaffs_verify_chunk_written(dev, chunk, data, tags);
 
-               if (writeOk != YAFFS_OK) {
+               if (write_ok != YAFFS_OK) {
                        /* Clean up aborted write, skip to next block and
                         * try another chunk */
-                       yaffs_handle_chunk_wr_error(dev, chunk, erasedOk);
+                       yaffs_handle_chunk_wr_error(dev, chunk, erased_ok);
                        continue;
                }
 
@@ -468,58 +567,58 @@ static int yaffs_write_new_chunk(struct yaffs_dev_s *dev,
                /* Copy the data into the robustification buffer */
                yaffs_handle_chunk_wr_ok(dev, chunk, data, tags);
 
-       } while (writeOk != YAFFS_OK &&
-               (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
+       } while (write_ok != YAFFS_OK &&
+                (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
 
-       if (!writeOk)
+       if (!write_ok)
                chunk = -1;
 
        if (attempts > 1) {
-               T(YAFFS_TRACE_ERROR,
-                       (TSTR("**>> yaffs write required %d attempts" TENDSTR),
-                       attempts));
-
-               dev->n_retired_writes += (attempts - 1);
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "**>> yaffs write required %d attempts",
+                       attempts);
+               dev->n_retried_writes += (attempts - 1);
        }
 
        return chunk;
 }
 
-
 /*
  * Block retiring for handling a broken block.
  */
 
-static void yaffs_retire_block(yaffs_dev_t *dev, int flash_block)
+static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block)
 {
-       yaffs_block_info_t *bi = yaffs_get_block_info(dev, flash_block);
+       struct yaffs_block_info *bi = yaffs_get_block_info(dev, flash_block);
 
        yaffs2_checkpt_invalidate(dev);
-       
-       yaffs2_clear_oldest_dirty_seq(dev,bi);
+
+       yaffs2_clear_oldest_dirty_seq(dev, bi);
 
        if (yaffs_mark_bad(dev, flash_block) != YAFFS_OK) {
                if (yaffs_erase_block(dev, flash_block) != YAFFS_OK) {
-                       T(YAFFS_TRACE_ALWAYS, (TSTR(
-                               "yaffs: Failed to mark bad and erase block %d"
-                               TENDSTR), flash_block));
+                       yaffs_trace(YAFFS_TRACE_ALWAYS,
+                               "yaffs: Failed to mark bad and erase block %d",
+                               flash_block);
                } else {
-                       yaffs_ext_tags tags;
-                       int chunk_id = flash_block * dev->param.chunks_per_block;
+                       struct yaffs_ext_tags tags;
+                       int chunk_id =
+                           flash_block * dev->param.chunks_per_block;
 
-                       __u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
+                       u8 *buffer = yaffs_get_temp_buffer(dev);
 
                        memset(buffer, 0xff, dev->data_bytes_per_chunk);
-                       yaffs_init_tags(&tags);
+                       memset(&tags, 0, sizeof(tags));
                        tags.seq_number = YAFFS_SEQUENCE_BAD_BLOCK;
-                       if (dev->param.write_chunk_tags_fn(dev, chunk_id -
-                               dev->chunk_offset, buffer, &tags) != YAFFS_OK)
-                               T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-                                       TCONT("write bad block marker to block %d")
-                                       TENDSTR), flash_block));
-
-                       yaffs_release_temp_buffer(dev, buffer, __LINE__);
+                       if (dev->tagger.write_chunk_tags_fn(dev, chunk_id -
+                                                       dev->chunk_offset,
+                                                       buffer,
+                                                       &tags) != YAFFS_OK)
+                               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                                       "yaffs: Failed to write bad block marker to block %d",
+                                       flash_block);
+
+                       yaffs_release_temp_buffer(dev, buffer);
                }
        }
 
@@ -530,110 +629,64 @@ static void yaffs_retire_block(yaffs_dev_t *dev, int flash_block)
        dev->n_retired_blocks++;
 }
 
-/*
- * Functions for robustisizing TODO
- *
- */
-
-static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk,
-                               const __u8 *data,
-                               const yaffs_ext_tags *tags)
-{
-       dev=dev;
-       nand_chunk=nand_chunk;
-       data=data;
-       tags=tags;
-}
+/*---------------- Name handling functions ------------*/
 
-static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk,
-                               const yaffs_ext_tags *tags)
+static u16 yaffs_calc_name_sum(const YCHAR *name)
 {
-       dev=dev;
-       nand_chunk=nand_chunk;
-       tags=tags;
-}
+       u16 sum = 0;
+       u16 i = 1;
 
-void yaffs_handle_chunk_error(yaffs_dev_t *dev, yaffs_block_info_t *bi)
-{
-       if (!bi->gc_prioritise) {
-               bi->gc_prioritise = 1;
-               dev->has_pending_prioritised_gc = 1;
-               bi->chunk_error_strikes++;
+       if (!name)
+               return 0;
 
-               if (bi->chunk_error_strikes > 3) {
-                       bi->needs_retiring = 1; /* Too many stikes, so retire this */
-                       T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
+       while ((*name) && i < (YAFFS_MAX_NAME_LENGTH / 2)) {
 
-               }
+               /* 0x1f mask is case insensitive */
+               sum += ((*name) & 0x1f) * i;
+               i++;
+               name++;
        }
+       return sum;
 }
 
-static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk,
-               int erasedOk)
-{
-       int flash_block = nand_chunk / dev->param.chunks_per_block;
-       yaffs_block_info_t *bi = yaffs_get_block_info(dev, flash_block);
 
-       yaffs_handle_chunk_error(dev, bi);
+void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name)
+{
+       memset(obj->short_name, 0, sizeof(obj->short_name));
 
-       if (erasedOk) {
-               /* Was an actual write failure, so mark the block for retirement  */
-               bi->needs_retiring = 1;
-               T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-                 (TSTR("**>> Block %d needs retiring" TENDSTR), flash_block));
+       if (name && !name[0]) {
+               yaffs_fix_null_name(obj, obj->short_name,
+                               YAFFS_SHORT_NAME_LENGTH);
+               name = obj->short_name;
+       } else if (name &&
+               strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <=
+               YAFFS_SHORT_NAME_LENGTH)  {
+               strcpy(obj->short_name, name);
        }
 
-       /* Delete the chunk */
-       yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
-       yaffs_skip_rest_of_block(dev);
+       obj->sum = yaffs_calc_name_sum(name);
 }
 
-
-/*---------------- Name handling functions ------------*/
-
-static __u16 yaffs_calc_name_sum(const YCHAR *name)
+void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj,
+                               const struct yaffs_obj_hdr *oh)
 {
-       __u16 sum = 0;
-       __u16 i = 1;
-
-       const YUCHAR *bname = (const YUCHAR *) name;
-       if (bname) {
-               while ((*bname) && (i < (YAFFS_MAX_NAME_LENGTH/2))) {
-
-#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
-                       sum += yaffs_toupper(*bname) * i;
+#ifdef CONFIG_YAFFS_AUTO_UNICODE
+       YCHAR tmp_name[YAFFS_MAX_NAME_LENGTH + 1];
+       memset(tmp_name, 0, sizeof(tmp_name));
+       yaffs_load_name_from_oh(obj->my_dev, tmp_name, oh->name,
+                               YAFFS_MAX_NAME_LENGTH + 1);
+       yaffs_set_obj_name(obj, tmp_name);
 #else
-                       sum += (*bname) * i;
+       yaffs_set_obj_name(obj, oh->name);
 #endif
-                       i++;
-                       bname++;
-               }
-       }
-       return sum;
 }
 
-void yaffs_set_obj_name(yaffs_obj_t *obj, const YCHAR *name)
+loff_t yaffs_max_file_size(struct yaffs_dev *dev)
 {
-#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-       memset(obj->short_name, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
-       if (name && yaffs_strnlen(name,YAFFS_SHORT_NAME_LENGTH+1) <= YAFFS_SHORT_NAME_LENGTH)
-               yaffs_strcpy(obj->short_name, name);
+       if(sizeof(loff_t) < 8)
+               return YAFFS_MAX_FILE_SIZE_32;
        else
-               obj->short_name[0] = _Y('\0');
-#endif
-       obj->sum = yaffs_calc_name_sum(name);
-}
-
-void yaffs_set_obj_name_from_oh(yaffs_obj_t *obj, const yaffs_obj_header *oh)
-{
-#ifdef CONFIG_YAFFS_AUTO_UNICODE
-       YCHAR tmpName[YAFFS_MAX_NAME_LENGTH+1];
-       memset(tmpName,0,sizeof(tmpName));
-       yaffs_load_name_from_oh(obj->my_dev,tmpName,oh->name,YAFFS_MAX_NAME_LENGTH+1);
-       yaffs_set_obj_name(obj,tmpName);
-#else
-       yaffs_set_obj_name(obj,oh->name);
-#endif
+               return ((loff_t) YAFFS_MAX_CHUNK_ID) * dev->data_bytes_per_chunk;
 }
 
 /*-------------------- TNODES -------------------
@@ -643,87 +696,87 @@ void yaffs_set_obj_name_from_oh(yaffs_obj_t *obj, const yaffs_obj_header *oh)
  * in the tnode.
  */
 
-
-yaffs_tnode_t *yaffs_get_tnode(yaffs_dev_t *dev)
+struct yaffs_tnode *yaffs_get_tnode(struct yaffs_dev *dev)
 {
-       yaffs_tnode_t *tn = yaffs_alloc_raw_tnode(dev);
-       if (tn){
+       struct yaffs_tnode *tn = yaffs_alloc_raw_tnode(dev);
+
+       if (tn) {
                memset(tn, 0, dev->tnode_size);
                dev->n_tnodes++;
        }
 
-       dev->checkpoint_blocks_required = 0; /* force recalculation*/
+       dev->checkpoint_blocks_required = 0;    /* force recalculation */
 
        return tn;
 }
 
 /* FreeTnode frees up a tnode and puts it back on the free list */
-static void yaffs_free_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
+static void yaffs_free_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
 {
-       yaffs_free_raw_tnode(dev,tn);
+       yaffs_free_raw_tnode(dev, tn);
        dev->n_tnodes--;
-       dev->checkpoint_blocks_required = 0; /* force recalculation*/
+       dev->checkpoint_blocks_required = 0;    /* force recalculation */
 }
 
-static void yaffs_deinit_tnodes_and_objs(yaffs_dev_t *dev)
+static void yaffs_deinit_tnodes_and_objs(struct yaffs_dev *dev)
 {
        yaffs_deinit_raw_tnodes_and_objs(dev);
        dev->n_obj = 0;
        dev->n_tnodes = 0;
 }
 
-
-void yaffs_load_tnode_0(yaffs_dev_t *dev, yaffs_tnode_t *tn, unsigned pos,
-               unsigned val)
+static void yaffs_load_tnode_0(struct yaffs_dev *dev, struct yaffs_tnode *tn,
+                       unsigned pos, unsigned val)
 {
-       __u32 *map = (__u32 *)tn;
-       __u32 bitInMap;
-       __u32 bitInWord;
-       __u32 wordInMap;
-       __u32 mask;
+       u32 *map = (u32 *) tn;
+       u32 bit_in_map;
+       u32 bit_in_word;
+       u32 word_in_map;
+       u32 mask;
 
        pos &= YAFFS_TNODES_LEVEL0_MASK;
        val >>= dev->chunk_grp_bits;
 
-       bitInMap = pos * dev->tnode_width;
-       wordInMap = bitInMap / 32;
-       bitInWord = bitInMap & (32 - 1);
+       bit_in_map = pos * dev->tnode_width;
+       word_in_map = bit_in_map / 32;
+       bit_in_word = bit_in_map & (32 - 1);
 
-       mask = dev->tnode_mask << bitInWord;
+       mask = dev->tnode_mask << bit_in_word;
 
-       map[wordInMap] &= ~mask;
-       map[wordInMap] |= (mask & (val << bitInWord));
+       map[word_in_map] &= ~mask;
+       map[word_in_map] |= (mask & (val << bit_in_word));
 
-       if (dev->tnode_width > (32 - bitInWord)) {
-               bitInWord = (32 - bitInWord);
-               wordInMap++;;
-               mask = dev->tnode_mask >> (/*dev->tnode_width -*/ bitInWord);
-               map[wordInMap] &= ~mask;
-               map[wordInMap] |= (mask & (val >> bitInWord));
+       if (dev->tnode_width > (32 - bit_in_word)) {
+               bit_in_word = (32 - bit_in_word);
+               word_in_map++;
+               mask =
+                   dev->tnode_mask >> bit_in_word;
+               map[word_in_map] &= ~mask;
+               map[word_in_map] |= (mask & (val >> bit_in_word));
        }
 }
 
-__u32 yaffs_get_group_base(yaffs_dev_t *dev, yaffs_tnode_t *tn,
-               unsigned pos)
+u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn,
+                        unsigned pos)
 {
-       __u32 *map = (__u32 *)tn;
-       __u32 bitInMap;
-       __u32 bitInWord;
-       __u32 wordInMap;
-       __u32 val;
+       u32 *map = (u32 *) tn;
+       u32 bit_in_map;
+       u32 bit_in_word;
+       u32 word_in_map;
+       u32 val;
 
        pos &= YAFFS_TNODES_LEVEL0_MASK;
 
-       bitInMap = pos * dev->tnode_width;
-       wordInMap = bitInMap / 32;
-       bitInWord = bitInMap & (32 - 1);
+       bit_in_map = pos * dev->tnode_width;
+       word_in_map = bit_in_map / 32;
+       bit_in_word = bit_in_map & (32 - 1);
 
-       val = map[wordInMap] >> bitInWord;
+       val = map[word_in_map] >> bit_in_word;
 
-       if      (dev->tnode_width > (32 - bitInWord)) {
-               bitInWord = (32 - bitInWord);
-               wordInMap++;;
-               val |= (map[wordInMap] << bitInWord);
+       if (dev->tnode_width > (32 - bit_in_word)) {
+               bit_in_word = (32 - bit_in_word);
+               word_in_map++;
+               val |= (map[word_in_map] << bit_in_word);
        }
 
        val &= dev->tnode_mask;
@@ -740,16 +793,16 @@ __u32 yaffs_get_group_base(yaffs_dev_t *dev, yaffs_tnode_t *tn,
  */
 
 /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
-yaffs_tnode_t *yaffs_find_tnode_0(yaffs_dev_t *dev,
-                                       yaffs_file_s *file_struct,
-                                       __u32 chunk_id)
+struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev,
+                                      struct yaffs_file_var *file_struct,
+                                      u32 chunk_id)
 {
-       yaffs_tnode_t *tn = file_struct->top;
-       __u32 i;
-       int requiredTallness;
+       struct yaffs_tnode *tn = file_struct->top;
+       u32 i;
+       int required_depth;
        int level = file_struct->top_level;
 
-       dev=dev;
+       (void) dev;
 
        /* Check sane level and chunk Id */
        if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
@@ -761,54 +814,54 @@ yaffs_tnode_t *yaffs_find_tnode_0(yaffs_dev_t *dev,
        /* First check we're tall enough (ie enough top_level) */
 
        i = chunk_id >> YAFFS_TNODES_LEVEL0_BITS;
-       requiredTallness = 0;
+       required_depth = 0;
        while (i) {
                i >>= YAFFS_TNODES_INTERNAL_BITS;
-               requiredTallness++;
+               required_depth++;
        }
 
-       if (requiredTallness > file_struct->top_level)
-               return NULL; /* Not tall enough, so we can't find it */
+       if (required_depth > file_struct->top_level)
+               return NULL;    /* Not tall enough, so we can't find it */
 
        /* Traverse down to level 0 */
        while (level > 0 && tn) {
                tn = tn->internal[(chunk_id >>
-                       (YAFFS_TNODES_LEVEL0_BITS +
-                               (level - 1) *
-                               YAFFS_TNODES_INTERNAL_BITS)) &
-                       YAFFS_TNODES_INTERNAL_MASK];
+                                  (YAFFS_TNODES_LEVEL0_BITS +
+                                   (level - 1) *
+                                   YAFFS_TNODES_INTERNAL_BITS)) &
+                                 YAFFS_TNODES_INTERNAL_MASK];
                level--;
        }
 
        return tn;
 }
 
-/* AddOrFindLevel0Tnode finds the level 0 tnode if it exists, otherwise first expands the tree.
+/* add_find_tnode_0 finds the level 0 tnode if it exists,
+ * otherwise first expands the tree.
  * This happens in two steps:
  *  1. If the tree isn't tall enough, then make it taller.
  *  2. Scan down the tree towards the level 0 tnode adding tnodes if required.
  *
  * Used when modifying the tree.
  *
- *  If the tn argument is NULL, then a fresh tnode will be added otherwise the specified tn will
- *  be plugged into the ttree.
+ *  If the tn argument is NULL, then a fresh tnode will be added otherwise the
+ *  specified tn will be plugged into the ttree.
  */
 
-yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev,
-                                       yaffs_file_s *file_struct,
-                                       __u32 chunk_id,
-                                       yaffs_tnode_t *passed_tn)
+struct yaffs_tnode *yaffs_add_find_tnode_0(struct yaffs_dev *dev,
+                                          struct yaffs_file_var *file_struct,
+                                          u32 chunk_id,
+                                          struct yaffs_tnode *passed_tn)
 {
-       int requiredTallness;
+       int required_depth;
        int i;
        int l;
-       yaffs_tnode_t *tn;
-
-       __u32 x;
-
+       struct yaffs_tnode *tn;
+       u32 x;
 
        /* Check sane level and page Id */
-       if (file_struct->top_level < 0 || file_struct->top_level > YAFFS_TNODES_MAX_LEVEL)
+       if (file_struct->top_level < 0 ||
+           file_struct->top_level > YAFFS_TNODES_MAX_LEVEL)
                return NULL;
 
        if (chunk_id > YAFFS_MAX_CHUNK_ID)
@@ -817,16 +870,15 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev,
        /* First check we're tall enough (ie enough top_level) */
 
        x = chunk_id >> YAFFS_TNODES_LEVEL0_BITS;
-       requiredTallness = 0;
+       required_depth = 0;
        while (x) {
                x >>= YAFFS_TNODES_INTERNAL_BITS;
-               requiredTallness++;
+               required_depth++;
        }
 
-
-       if (requiredTallness > file_struct->top_level) {
+       if (required_depth > file_struct->top_level) {
                /* Not tall enough, gotta make the tree taller */
-               for (i = file_struct->top_level; i < requiredTallness; i++) {
+               for (i = file_struct->top_level; i < required_depth; i++) {
 
                        tn = yaffs_get_tnode(dev);
 
@@ -835,8 +887,8 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev,
                                file_struct->top = tn;
                                file_struct->top_level++;
                        } else {
-                               T(YAFFS_TRACE_ERROR,
-                                       (TSTR("yaffs: no more tnodes" TENDSTR)));
+                               yaffs_trace(YAFFS_TRACE_ERROR,
+                                       "yaffs: no more tnodes");
                                return NULL;
                        }
                }
@@ -854,24 +906,24 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev,
                              (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
                            YAFFS_TNODES_INTERNAL_MASK;
 
-
                        if ((l > 1) && !tn->internal[x]) {
                                /* Add missing non-level-zero tnode */
                                tn->internal[x] = yaffs_get_tnode(dev);
-                               if(!tn->internal[x])
+                               if (!tn->internal[x])
                                        return NULL;
                        } else if (l == 1) {
                                /* Looking from level 1 at level 0 */
                                if (passed_tn) {
-                                       /* If we already have one, then release it.*/
+                                       /* If we already have one, release it */
                                        if (tn->internal[x])
-                                               yaffs_free_tnode(dev, tn->internal[x]);
+                                               yaffs_free_tnode(dev,
+                                                       tn->internal[x]);
                                        tn->internal[x] = passed_tn;
 
                                } else if (!tn->internal[x]) {
                                        /* Don't have one, none passed in */
                                        tn->internal[x] = yaffs_get_tnode(dev);
-                                       if(!tn->internal[x])
+                                       if (!tn->internal[x])
                                                return NULL;
                                }
                        }
@@ -882,7 +934,8 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev,
        } else {
                /* top is level 0 */
                if (passed_tn) {
-                       memcpy(tn, passed_tn, (dev->tnode_width * YAFFS_NTNODES_LEVEL0)/8);
+                       memcpy(tn, passed_tn,
+                              (dev->tnode_width * YAFFS_NTNODES_LEVEL0) / 8);
                        yaffs_free_tnode(dev, passed_tn);
                }
        }
@@ -890,425 +943,685 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev,
        return tn;
 }
 
-static int yaffs_find_chunk_in_group(yaffs_dev_t *dev, int theChunk,
-                               yaffs_ext_tags *tags, int obj_id,
-                               int inode_chunk)
+static int yaffs_tags_match(const struct yaffs_ext_tags *tags, int obj_id,
+                           int chunk_obj)
+{
+       return (tags->chunk_id == chunk_obj &&
+               tags->obj_id == obj_id &&
+               !tags->is_deleted) ? 1 : 0;
+
+}
+
+static int yaffs_find_chunk_in_group(struct yaffs_dev *dev, int the_chunk,
+                                       struct yaffs_ext_tags *tags, int obj_id,
+                                       int inode_chunk)
 {
        int j;
 
-       for (j = 0; theChunk && j < dev->chunk_grp_size; j++) {
-               if (yaffs_check_chunk_bit(dev, theChunk / dev->param.chunks_per_block,
-                               theChunk % dev->param.chunks_per_block)) {
-                       
-                       if(dev->chunk_grp_size == 1)
-                               return theChunk;
+       for (j = 0; the_chunk && j < dev->chunk_grp_size; j++) {
+               if (yaffs_check_chunk_bit
+                   (dev, the_chunk / dev->param.chunks_per_block,
+                    the_chunk % dev->param.chunks_per_block)) {
+
+                       if (dev->chunk_grp_size == 1)
+                               return the_chunk;
                        else {
-                               yaffs_rd_chunk_tags_nand(dev, theChunk, NULL,
-                                                               tags);
-                               if (yaffs_tags_match(tags, obj_id, inode_chunk)) {
+                               yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
+                                                        tags);
+                               if (yaffs_tags_match(tags,
+                                                       obj_id, inode_chunk)) {
                                        /* found it; */
-                                       return theChunk;
+                                       return the_chunk;
                                }
                        }
                }
-               theChunk++;
+               the_chunk++;
        }
        return -1;
 }
 
-#if 0
-/* Experimental code not being used yet. Might speed up file deletion */
-/* DeleteWorker scans backwards through the tnode tree and deletes all the
- * chunks and tnodes in the file.
- * Returns 1 if the tree was deleted.
- * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
- */
-
-static int yaffs_del_worker(yaffs_obj_t *in, yaffs_tnode_t *tn, __u32 level,
-                             int chunk_offset, int *limit)
+int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
+                                   struct yaffs_ext_tags *tags)
 {
-       int i;
-       int inode_chunk;
-       int theChunk;
-       yaffs_ext_tags tags;
-       int foundChunk;
-       yaffs_dev_t *dev = in->my_dev;
+       /*Get the Tnode, then get the level 0 offset chunk offset */
+       struct yaffs_tnode *tn;
+       int the_chunk = -1;
+       struct yaffs_ext_tags local_tags;
+       int ret_val = -1;
+       struct yaffs_dev *dev = in->my_dev;
 
-       int allDone = 1;
+       if (!tags) {
+               /* Passed a NULL, so use our own tags space */
+               tags = &local_tags;
+       }
 
-       if (tn) {
-               if (level > 0) {
-                       for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
-                            i--) {
-                               if (tn->internal[i]) {
-                                       if (limit && (*limit) < 0) {
-                                               allDone = 0;
-                                       } else {
-                                               allDone =
-                                                       yaffs_del_worker(in,
-                                                               tn->
-                                                               internal
-                                                               [i],
-                                                               level -
-                                                               1,
-                                                               (chunk_offset
-                                                                       <<
-                                                                       YAFFS_TNODES_INTERNAL_BITS)
-                                                               + i,
-                                                               limit);
-                                       }
-                                       if (allDone) {
-                                               yaffs_free_tnode(dev,
-                                                               tn->
-                                                               internal[i]);
-                                               tn->internal[i] = NULL;
-                                       }
-                               }
-                       }
-                       return (allDone) ? 1 : 0;
-               } else if (level == 0) {
-                       int hitLimit = 0;
-
-                       for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
-                                       i--) {
-                               theChunk = yaffs_get_group_base(dev, tn, i);
-                               if (theChunk) {
-
-                                       inode_chunk = (chunk_offset <<
-                                               YAFFS_TNODES_LEVEL0_BITS) + i;
-
-                                       foundChunk =
-                                               yaffs_find_chunk_in_group(dev,
-                                                               theChunk,
-                                                               &tags,
-                                                               in->obj_id,
-                                                               inode_chunk);
-
-                                       if (foundChunk > 0) {
-                                               yaffs_chunk_del(dev,
-                                                                 foundChunk, 1,
-                                                                 __LINE__);
-                                               in->n_data_chunks--;
-                                               if (limit) {
-                                                       *limit = *limit - 1;
-                                                       if (*limit <= 0)
-                                                               hitLimit = 1;
-                                               }
+       tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
 
-                                       }
+       if (!tn)
+               return ret_val;
 
-                                       yaffs_load_tnode_0(dev, tn, i, 0);
-                               }
+       the_chunk = yaffs_get_group_base(dev, tn, inode_chunk);
 
+       ret_val = yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id,
+                                             inode_chunk);
+       return ret_val;
+}
+
+static int yaffs_find_del_file_chunk(struct yaffs_obj *in, int inode_chunk,
+                                    struct yaffs_ext_tags *tags)
+{
+       /* Get the Tnode, then get the level 0 offset chunk offset */
+       struct yaffs_tnode *tn;
+       int the_chunk = -1;
+       struct yaffs_ext_tags local_tags;
+       struct yaffs_dev *dev = in->my_dev;
+       int ret_val = -1;
+
+       if (!tags) {
+               /* Passed a NULL, so use our own tags space */
+               tags = &local_tags;
+       }
+
+       tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
+
+       if (!tn)
+               return ret_val;
+
+       the_chunk = yaffs_get_group_base(dev, tn, inode_chunk);
+
+       ret_val = yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id,
+                                             inode_chunk);
+
+       /* Delete the entry in the filestructure (if found) */
+       if (ret_val != -1)
+               yaffs_load_tnode_0(dev, tn, inode_chunk, 0);
+
+       return ret_val;
+}
+
+int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
+                           int nand_chunk, int in_scan)
+{
+       /* NB in_scan is zero unless scanning.
+        * For forward scanning, in_scan is > 0;
+        * for backward scanning in_scan is < 0
+        *
+        * nand_chunk = 0 is a dummy insert to make sure the tnodes are there.
+        */
+
+       struct yaffs_tnode *tn;
+       struct yaffs_dev *dev = in->my_dev;
+       int existing_cunk;
+       struct yaffs_ext_tags existing_tags;
+       struct yaffs_ext_tags new_tags;
+       unsigned existing_serial, new_serial;
+
+       if (in->variant_type != YAFFS_OBJECT_TYPE_FILE) {
+               /* Just ignore an attempt at putting a chunk into a non-file
+                * during scanning.
+                * If it is not during Scanning then something went wrong!
+                */
+               if (!in_scan) {
+                       yaffs_trace(YAFFS_TRACE_ERROR,
+                               "yaffs tragedy:attempt to put data chunk into a non-file"
+                               );
+                       BUG();
+               }
+
+               yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
+               return YAFFS_OK;
+       }
+
+       tn = yaffs_add_find_tnode_0(dev,
+                                   &in->variant.file_variant,
+                                   inode_chunk, NULL);
+       if (!tn)
+               return YAFFS_FAIL;
+
+       if (!nand_chunk)
+               /* Dummy insert, bail now */
+               return YAFFS_OK;
+
+       existing_cunk = yaffs_get_group_base(dev, tn, inode_chunk);
+
+       if (in_scan != 0) {
+               /* If we're scanning then we need to test for duplicates
+                * NB This does not need to be efficient since it should only
+                * happen when the power fails during a write, then only one
+                * chunk should ever be affected.
+                *
+                * Correction for YAFFS2: This could happen quite a lot and we
+                * need to think about efficiency! TODO
+                * Update: For backward scanning we don't need to re-read tags
+                * so this is quite cheap.
+                */
+
+               if (existing_cunk > 0) {
+                       /* NB Right now existing chunk will not be real
+                        * chunk_id if the chunk group size > 1
+                        * thus we have to do a FindChunkInFile to get the
+                        * real chunk id.
+                        *
+                        * We have a duplicate now we need to decide which
+                        * one to use:
+                        *
+                        * Backwards scanning YAFFS2: The old one is what
+                        * we use, dump the new one.
+                        * YAFFS1: Get both sets of tags and compare serial
+                        * numbers.
+                        */
+
+                       if (in_scan > 0) {
+                               /* Only do this for forward scanning */
+                               yaffs_rd_chunk_tags_nand(dev,
+                                                        nand_chunk,
+                                                        NULL, &new_tags);
+
+                               /* Do a proper find */
+                               existing_cunk =
+                                   yaffs_find_chunk_in_file(in, inode_chunk,
+                                                            &existing_tags);
+                       }
+
+                       if (existing_cunk <= 0) {
+                               /*Hoosterman - how did this happen? */
+
+                               yaffs_trace(YAFFS_TRACE_ERROR,
+                                       "yaffs tragedy: existing chunk < 0 in scan"
+                                       );
+
+                       }
+
+                       /* NB The deleted flags should be false, otherwise
+                        * the chunks will not be loaded during a scan
+                        */
+
+                       if (in_scan > 0) {
+                               new_serial = new_tags.serial_number;
+                               existing_serial = existing_tags.serial_number;
                        }
-                       return (i < 0) ? 1 : 0;
 
+                       if ((in_scan > 0) &&
+                           (existing_cunk <= 0 ||
+                            ((existing_serial + 1) & 3) == new_serial)) {
+                               /* Forward scanning.
+                                * Use new
+                                * Delete the old one and drop through to
+                                * update the tnode
+                                */
+                               yaffs_chunk_del(dev, existing_cunk, 1,
+                                               __LINE__);
+                       } else {
+                               /* Backward scanning or we want to use the
+                                * existing one
+                                * Delete the new one and return early so that
+                                * the tnode isn't changed
+                                */
+                               yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
+                               return YAFFS_OK;
+                       }
                }
 
        }
 
-       return 1;
+       if (existing_cunk == 0)
+               in->n_data_chunks++;
 
-}
+       yaffs_load_tnode_0(dev, tn, inode_chunk, nand_chunk);
 
-#endif
+       return YAFFS_OK;
+}
 
-static void yaffs_soft_del_chunk(yaffs_dev_t *dev, int chunk)
+static void yaffs_soft_del_chunk(struct yaffs_dev *dev, int chunk)
 {
-       yaffs_block_info_t *theBlock;
+       struct yaffs_block_info *the_block;
        unsigned block_no;
 
-       T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
+       yaffs_trace(YAFFS_TRACE_DELETION, "soft delete chunk %d", chunk);
 
-       block_no =  chunk / dev->param.chunks_per_block;
-       theBlock = yaffs_get_block_info(dev, block_no);
-       if (theBlock) {
-               theBlock->soft_del_pages++;
+       block_no = chunk / dev->param.chunks_per_block;
+       the_block = yaffs_get_block_info(dev, block_no);
+       if (the_block) {
+               the_block->soft_del_pages++;
                dev->n_free_chunks++;
-               yaffs2_update_oldest_dirty_seq(dev, block_no, theBlock);
+               yaffs2_update_oldest_dirty_seq(dev, block_no, the_block);
        }
 }
 
-/* SoftDeleteWorker scans backwards through the tnode tree and soft deletes all the chunks in the file.
- * All soft deleting does is increment the block's softdelete count and pulls the chunk out
- * of the tnode.
- * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
+/* SoftDeleteWorker scans backwards through the tnode tree and soft deletes all
+ * the chunks in the file.
+ * All soft deleting does is increment the block's softdelete count and pulls
+ * the chunk out of the tnode.
+ * Thus, essentially this is the same as DeleteWorker except that the chunks
+ * are soft deleted.
  */
 
-static int yaffs_soft_del_worker(yaffs_obj_t *in, yaffs_tnode_t *tn,
-                                 __u32 level, int chunk_offset)
+static int yaffs_soft_del_worker(struct yaffs_obj *in, struct yaffs_tnode *tn,
+                                u32 level, int chunk_offset)
 {
        int i;
-       int theChunk;
-       int allDone = 1;
-       yaffs_dev_t *dev = in->my_dev;
+       int the_chunk;
+       int all_done = 1;
+       struct yaffs_dev *dev = in->my_dev;
 
-       if (tn) {
-               if (level > 0) {
-
-                       for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
-                            i--) {
-                               if (tn->internal[i]) {
-                                       allDone =
-                                           yaffs_soft_del_worker(in,
-                                                                  tn->
-                                                                  internal[i],
-                                                                  level - 1,
-                                                                  (chunk_offset
-                                                                   <<
-                                                                   YAFFS_TNODES_INTERNAL_BITS)
-                                                                  + i);
-                                       if (allDone) {
-                                               yaffs_free_tnode(dev,
-                                                               tn->
-                                                               internal[i]);
-                                               tn->internal[i] = NULL;
-                                       } else {
-                                               /* Hoosterman... how could this happen? */
-                                       }
-                               }
-                       }
-                       return (allDone) ? 1 : 0;
-               } else if (level == 0) {
-
-                       for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
-                               theChunk = yaffs_get_group_base(dev, tn, i);
-                               if (theChunk) {
-                                       /* Note this does not find the real chunk, only the chunk group.
-                                        * We make an assumption that a chunk group is not larger than
-                                        * a block.
-                                        */
-                                       yaffs_soft_del_chunk(dev, theChunk);
-                                       yaffs_load_tnode_0(dev, tn, i, 0);
-                               }
+       if (!tn)
+               return 1;
 
+       if (level > 0) {
+               for (i = YAFFS_NTNODES_INTERNAL - 1;
+                       all_done && i >= 0;
+                       i--) {
+                       if (tn->internal[i]) {
+                               all_done =
+                                   yaffs_soft_del_worker(in,
+                                       tn->internal[i],
+                                       level - 1,
+                                       (chunk_offset <<
+                                       YAFFS_TNODES_INTERNAL_BITS)
+                                       + i);
+                               if (all_done) {
+                                       yaffs_free_tnode(dev,
+                                               tn->internal[i]);
+                                       tn->internal[i] = NULL;
+                               } else {
+                                       /* Can this happen? */
+                               }
                        }
-                       return 1;
+               }
+               return (all_done) ? 1 : 0;
+       }
 
+       /* level 0 */
+        for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
+               the_chunk = yaffs_get_group_base(dev, tn, i);
+               if (the_chunk) {
+                       yaffs_soft_del_chunk(dev, the_chunk);
+                       yaffs_load_tnode_0(dev, tn, i, 0);
                }
+       }
+       return 1;
+}
+
+static void yaffs_remove_obj_from_dir(struct yaffs_obj *obj)
+{
+       struct yaffs_dev *dev = obj->my_dev;
+       struct yaffs_obj *parent;
+
+       yaffs_verify_obj_in_dir(obj);
+       parent = obj->parent;
 
+       yaffs_verify_dir(parent);
+
+       if (dev && dev->param.remove_obj_fn)
+               dev->param.remove_obj_fn(obj);
+
+       list_del_init(&obj->siblings);
+       obj->parent = NULL;
+
+       yaffs_verify_dir(parent);
+}
+
+void yaffs_add_obj_to_dir(struct yaffs_obj *directory, struct yaffs_obj *obj)
+{
+       if (!directory) {
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "tragedy: Trying to add an object to a null pointer directory"
+                       );
+               BUG();
+               return;
+       }
+       if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "tragedy: Trying to add an object to a non-directory"
+                       );
+               BUG();
        }
 
-       return 1;
+       if (obj->siblings.prev == NULL) {
+               /* Not initialised */
+               BUG();
+       }
+
+       yaffs_verify_dir(directory);
+
+       yaffs_remove_obj_from_dir(obj);
+
+       /* Now add it */
+       list_add(&obj->siblings, &directory->variant.dir_variant.children);
+       obj->parent = directory;
+
+       if (directory == obj->my_dev->unlinked_dir
+           || directory == obj->my_dev->del_dir) {
+               obj->unlinked = 1;
+               obj->my_dev->n_unlinked_files++;
+               obj->rename_allowed = 0;
+       }
 
+       yaffs_verify_dir(directory);
+       yaffs_verify_obj_in_dir(obj);
 }
 
-static void yaffs_soft_del_file(yaffs_obj_t *obj)
+static int yaffs_change_obj_name(struct yaffs_obj *obj,
+                                struct yaffs_obj *new_dir,
+                                const YCHAR *new_name, int force, int shadows)
 {
-       if (obj->deleted &&
-           obj->variant_type == YAFFS_OBJECT_TYPE_FILE && !obj->soft_del) {
-               if (obj->n_data_chunks <= 0) {
-                       /* Empty file with no duplicate object headers, just delete it immediately */
-                       yaffs_free_tnode(obj->my_dev,
-                                       obj->variant.file_variant.top);
-                       obj->variant.file_variant.top = NULL;
-                       T(YAFFS_TRACE_TRACING,
-                         (TSTR("yaffs: Deleting empty file %d" TENDSTR),
-                          obj->obj_id));
-                       yaffs_generic_obj_del(obj);
-               } else {
-                       yaffs_soft_del_worker(obj,
-                                              obj->variant.file_variant.top,
-                                              obj->variant.file_variant.
-                                              top_level, 0);
-                       obj->soft_del = 1;
-               }
+       int unlink_op;
+       int del_op;
+       struct yaffs_obj *existing_target;
+
+       if (new_dir == NULL)
+               new_dir = obj->parent;  /* use the old directory */
+
+       if (new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "tragedy: yaffs_change_obj_name: new_dir is not a directory"
+                       );
+               BUG();
        }
+
+       unlink_op = (new_dir == obj->my_dev->unlinked_dir);
+       del_op = (new_dir == obj->my_dev->del_dir);
+
+       existing_target = yaffs_find_by_name(new_dir, new_name);
+
+       /* If the object is a file going into the unlinked directory,
+        *   then it is OK to just stuff it in since duplicate names are OK.
+        *   else only proceed if the new name does not exist and we're putting
+        *   it into a directory.
+        */
+       if (!(unlink_op || del_op || force ||
+             shadows > 0 || !existing_target) ||
+             new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
+               return YAFFS_FAIL;
+
+       yaffs_set_obj_name(obj, new_name);
+       obj->dirty = 1;
+       yaffs_add_obj_to_dir(new_dir, obj);
+
+       if (unlink_op)
+               obj->unlinked = 1;
+
+       /* If it is a deletion then we mark it as a shrink for gc  */
+       if (yaffs_update_oh(obj, new_name, 0, del_op, shadows, NULL) >= 0)
+               return YAFFS_OK;
+
+       return YAFFS_FAIL;
 }
 
-/* Pruning removes any part of the file structure tree that is beyond the
- * bounds of the file (ie that does not point to chunks).
- *
- * A file should only get pruned when its size is reduced.
- *
- * Before pruning, the chunks must be pulled from the tree and the
- * level 0 tnode entries must be zeroed out.
- * Could also use this for file deletion, but that's probably better handled
- * by a special case.
+/*------------------------ Short Operations Cache ------------------------------
+ *   In many situations where there is no high level buffering  a lot of
+ *   reads might be short sequential reads, and a lot of writes may be short
+ *   sequential writes. eg. scanning/writing a jpeg file.
+ *   In these cases, a short read/write cache can provide a huge perfomance
+ *   benefit with dumb-as-a-rock code.
+ *   In Linux, the page cache provides read buffering and the short op cache
+ *   provides write buffering.
  *
- * This function is recursive. For levels > 0 the function is called again on
- * any sub-tree. For level == 0 we just check if the sub-tree has data.
- * If there is no data in a subtree then it is pruned.
+ *   There are a small number (~10) of cache chunks per device so that we don't
+ *   need a very intelligent search.
  */
 
-static yaffs_tnode_t *yaffs_prune_worker(yaffs_dev_t *dev, yaffs_tnode_t *tn,
-                               __u32 level, int del0)
+static int yaffs_obj_cache_dirty(struct yaffs_obj *obj)
 {
+       struct yaffs_dev *dev = obj->my_dev;
        int i;
-       int hasData;
+       struct yaffs_cache *cache;
+       int n_caches = obj->my_dev->param.n_caches;
 
-       if (tn) {
-               hasData = 0;
-
-               if(level > 0){
-                       for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
-                               if (tn->internal[i]) {
-                                       tn->internal[i] =
-                                               yaffs_prune_worker(dev, tn->internal[i],
-                                                       level - 1,
-                                                       (i == 0) ? del0 : 1);
-                               }
+       for (i = 0; i < n_caches; i++) {
+               cache = &dev->cache[i];
+               if (cache->object == obj && cache->dirty)
+                       return 1;
+       }
+
+       return 0;
+}
+
+static void yaffs_flush_file_cache(struct yaffs_obj *obj)
+{
+       struct yaffs_dev *dev = obj->my_dev;
+       int lowest = -99;       /* Stop compiler whining. */
+       int i;
+       struct yaffs_cache *cache;
+       int chunk_written = 0;
+       int n_caches = obj->my_dev->param.n_caches;
 
-                               if (tn->internal[i])
-                                       hasData++;
+       if (n_caches < 1)
+               return;
+       do {
+               cache = NULL;
+
+               /* Find the lowest dirty chunk for this object */
+               for (i = 0; i < n_caches; i++) {
+                       if (dev->cache[i].object == obj &&
+                           dev->cache[i].dirty) {
+                               if (!cache ||
+                                   dev->cache[i].chunk_id < lowest) {
+                                       cache = &dev->cache[i];
+                                       lowest = cache->chunk_id;
+                               }
                        }
-               } else {
-                       int tnode_size_u32 = dev->tnode_size/sizeof(__u32);
-                       __u32 *map = (__u32 *)tn;
+               }
+
+               if (cache && !cache->locked) {
+                       /* Write it out and free it up */
+                       chunk_written =
+                           yaffs_wr_data_obj(cache->object,
+                                             cache->chunk_id,
+                                             cache->data,
+                                             cache->n_bytes, 1);
+                       cache->dirty = 0;
+                       cache->object = NULL;
+               }
+       } while (cache && chunk_written > 0);
 
-                        for(i = 0; !hasData && i < tnode_size_u32; i++){
-                                if(map[i])
-                                        hasData++;
-                        }
-                }
+       if (cache)
+               /* Hoosterman, disk full while writing cache out. */
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "yaffs tragedy: no space during cache write");
+}
 
-               if (hasData == 0 && del0) {
-                       /* Free and return NULL */
+/*yaffs_flush_whole_cache(dev)
+ *
+ *
+ */
 
-                       yaffs_free_tnode(dev, tn);
-                       tn = NULL;
+void yaffs_flush_whole_cache(struct yaffs_dev *dev)
+{
+       struct yaffs_obj *obj;
+       int n_caches = dev->param.n_caches;
+       int i;
+
+       /* Find a dirty object in the cache and flush it...
+        * until there are no further dirty objects.
+        */
+       do {
+               obj = NULL;
+               for (i = 0; i < n_caches && !obj; i++) {
+                       if (dev->cache[i].object && dev->cache[i].dirty)
+                               obj = dev->cache[i].object;
                }
+               if (obj)
+                       yaffs_flush_file_cache(obj);
+       } while (obj);
 
-       }
+}
 
-       return tn;
+/* Grab us a cache chunk for use.
+ * First look for an empty one.
+ * Then look for the least recently used non-dirty one.
+ * Then look for the least recently used dirty one...., flush and look again.
+ */
+static struct yaffs_cache *yaffs_grab_chunk_worker(struct yaffs_dev *dev)
+{
+       int i;
 
+       if (dev->param.n_caches > 0) {
+               for (i = 0; i < dev->param.n_caches; i++) {
+                       if (!dev->cache[i].object)
+                               return &dev->cache[i];
+               }
+       }
+       return NULL;
 }
 
-static int yaffs_prune_tree(yaffs_dev_t *dev,
-                               yaffs_file_s *file_struct)
+static struct yaffs_cache *yaffs_grab_chunk_cache(struct yaffs_dev *dev)
 {
+       struct yaffs_cache *cache;
+       struct yaffs_obj *the_obj;
+       int usage;
        int i;
-       int hasData;
-       int done = 0;
-       yaffs_tnode_t *tn;
+       int pushout;
+
+       if (dev->param.n_caches < 1)
+               return NULL;
+
+       /* Try find a non-dirty one... */
 
-       if (file_struct->top_level > 0) {
-               file_struct->top =
-                   yaffs_prune_worker(dev, file_struct->top, file_struct->top_level, 0);
+       cache = yaffs_grab_chunk_worker(dev);
 
-               /* Now we have a tree with all the non-zero branches NULL but the height
-                * is the same as it was.
-                * Let's see if we can trim internal tnodes to shorten the tree.
-                * We can do this if only the 0th element in the tnode is in use
-                * (ie all the non-zero are NULL)
+       if (!cache) {
+               /* They were all dirty, find the LRU object and flush
+                * its cache, then  find again.
+                * NB what's here is not very accurate,
+                * we actually flush the object with the LRU chunk.
                 */
 
-               while (file_struct->top_level && !done) {
-                       tn = file_struct->top;
+               /* With locking we can't assume we can use entry zero,
+                * Set the_obj to a valid pointer for Coverity. */
+               the_obj = dev->cache[0].object;
+               usage = -1;
+               cache = NULL;
+               pushout = -1;
 
-                       hasData = 0;
-                       for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
-                               if (tn->internal[i])
-                                       hasData++;
+               for (i = 0; i < dev->param.n_caches; i++) {
+                       if (dev->cache[i].object &&
+                           !dev->cache[i].locked &&
+                           (dev->cache[i].last_use < usage ||
+                           !cache)) {
+                               usage = dev->cache[i].last_use;
+                               the_obj = dev->cache[i].object;
+                               cache = &dev->cache[i];
+                               pushout = i;
                        }
+               }
 
-                       if (!hasData) {
-                               file_struct->top = tn->internal[0];
-                               file_struct->top_level--;
-                               yaffs_free_tnode(dev, tn);
-                       } else {
-                               done = 1;
-                       }
+               if (!cache || cache->dirty) {
+                       /* Flush and try again */
+                       yaffs_flush_file_cache(the_obj);
+                       cache = yaffs_grab_chunk_worker(dev);
                }
        }
-
-       return YAFFS_OK;
+       return cache;
 }
 
-/*-------------------- End of File Structure functions.-------------------*/
-
-
-/* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
-static yaffs_obj_t *yaffs_alloc_empty_obj(yaffs_dev_t *dev)
+/* Find a cached chunk */
+static struct yaffs_cache *yaffs_find_chunk_cache(const struct yaffs_obj *obj,
+                                                 int chunk_id)
 {
-       yaffs_obj_t *obj = yaffs_alloc_raw_obj(dev);
-
-       if (obj) {
-               dev->n_obj++;
+       struct yaffs_dev *dev = obj->my_dev;
+       int i;
 
-               /* Now sweeten it up... */
+       if (dev->param.n_caches < 1)
+               return NULL;
 
-               memset(obj, 0, sizeof(yaffs_obj_t));
-               obj->being_created = 1;
+       for (i = 0; i < dev->param.n_caches; i++) {
+               if (dev->cache[i].object == obj &&
+                   dev->cache[i].chunk_id == chunk_id) {
+                       dev->cache_hits++;
 
-               obj->my_dev = dev;
-               obj->hdr_chunk = 0;
-               obj->variant_type = YAFFS_OBJECT_TYPE_UNKNOWN;
-               YINIT_LIST_HEAD(&(obj->hard_links));
-               YINIT_LIST_HEAD(&(obj->hash_link));
-               YINIT_LIST_HEAD(&obj->siblings);
+                       return &dev->cache[i];
+               }
+       }
+       return NULL;
+}
 
+/* Mark the chunk for the least recently used algorithym */
+static void yaffs_use_cache(struct yaffs_dev *dev, struct yaffs_cache *cache,
+                           int is_write)
+{
+       int i;
 
-               /* Now make the directory sane */
-               if (dev->root_dir) {
-                       obj->parent = dev->root_dir;
-                       ylist_add(&(obj->siblings), &dev->root_dir->variant.dir_variant.children);
-               }
+       if (dev->param.n_caches < 1)
+               return;
 
-               /* Add it to the lost and found directory.
-                * NB Can't put root or lostNFound in lostNFound so
-                * check if lostNFound exists first
-                */
-               if (dev->lost_n_found)
-                       yaffs_add_obj_to_dir(dev->lost_n_found, obj);
+       if (dev->cache_last_use < 0 ||
+               dev->cache_last_use > 100000000) {
+               /* Reset the cache usages */
+               for (i = 1; i < dev->param.n_caches; i++)
+                       dev->cache[i].last_use = 0;
 
-               obj->being_created = 0;
+               dev->cache_last_use = 0;
        }
+       dev->cache_last_use++;
+       cache->last_use = dev->cache_last_use;
 
-       dev->checkpoint_blocks_required = 0; /* force recalculation*/
-
-       return obj;
+       if (is_write)
+               cache->dirty = 1;
 }
 
-static yaffs_obj_t *yaffs_create_fake_dir(yaffs_dev_t *dev, int number,
-                                              __u32 mode)
+/* Invalidate a single cache page.
+ * Do this when a whole page gets written,
+ * ie the short cache for this page is no longer valid.
+ */
+static void yaffs_invalidate_chunk_cache(struct yaffs_obj *object, int chunk_id)
 {
+       struct yaffs_cache *cache;
 
-       yaffs_obj_t *obj =
-           yaffs_new_obj(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
-       if (obj) {
-               obj->fake = 1;          /* it is fake so it might have no NAND presence... */
-               obj->rename_allowed = 0;        /* ... and we're not allowed to rename it... */
-               obj->unlink_allowed = 0;        /* ... or unlink it */
-               obj->deleted = 0;
-               obj->unlinked = 0;
-               obj->yst_mode = mode;
-               obj->my_dev = dev;
-               obj->hdr_chunk = 0;     /* Not a valid chunk. */
+       if (object->my_dev->param.n_caches > 0) {
+               cache = yaffs_find_chunk_cache(object, chunk_id);
+
+               if (cache)
+                       cache->object = NULL;
        }
+}
 
-       return obj;
+/* Invalidate all the cache pages associated with this object
+ * Do this whenever ther file is deleted or resized.
+ */
+static void yaffs_invalidate_whole_cache(struct yaffs_obj *in)
+{
+       int i;
+       struct yaffs_dev *dev = in->my_dev;
 
+       if (dev->param.n_caches > 0) {
+               /* Invalidate it. */
+               for (i = 0; i < dev->param.n_caches; i++) {
+                       if (dev->cache[i].object == in)
+                               dev->cache[i].object = NULL;
+               }
+       }
 }
 
-static void yaffs_unhash_obj(yaffs_obj_t *obj)
+static void yaffs_unhash_obj(struct yaffs_obj *obj)
 {
        int bucket;
-       yaffs_dev_t *dev = obj->my_dev;
+       struct yaffs_dev *dev = obj->my_dev;
 
        /* If it is still linked into the bucket list, free from the list */
-       if (!ylist_empty(&obj->hash_link)) {
-               ylist_del_init(&obj->hash_link);
+       if (!list_empty(&obj->hash_link)) {
+               list_del_init(&obj->hash_link);
                bucket = yaffs_hash_fn(obj->obj_id);
                dev->obj_bucket[bucket].count--;
        }
 }
 
 /*  FreeObject frees up a Object and puts it back on the free list */
-static void yaffs_free_obj(yaffs_obj_t *obj)
+static void yaffs_free_obj(struct yaffs_obj *obj)
 {
-       yaffs_dev_t *dev = obj->my_dev;
-
-       T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), obj, obj->my_inode));
+       struct yaffs_dev *dev;
 
-       if (!obj)
-               YBUG();
+       if (!obj) {
+               BUG();
+               return;
+       }
+       dev = obj->my_dev;
+       yaffs_trace(YAFFS_TRACE_OS, "FreeObject %p inode %p",
+               obj, obj->my_inode);
        if (obj->parent)
-               YBUG();
-       if (!ylist_empty(&obj->siblings))
-               YBUG();
-
+               BUG();
+       if (!list_empty(&obj->siblings))
+               BUG();
 
        if (obj->my_inode) {
                /* We're still hooked up to a cached inode.
@@ -1320,40 +1633,213 @@ static void yaffs_free_obj(yaffs_obj_t *obj)
 
        yaffs_unhash_obj(obj);
 
-       yaffs_free_raw_obj(dev,obj);
+       yaffs_free_raw_obj(dev, obj);
        dev->n_obj--;
-       dev->checkpoint_blocks_required = 0; /* force recalculation*/
+       dev->checkpoint_blocks_required = 0;    /* force recalculation */
 }
 
-
-void yaffs_handle_defered_free(yaffs_obj_t *obj)
+void yaffs_handle_defered_free(struct yaffs_obj *obj)
 {
        if (obj->defered_free)
                yaffs_free_obj(obj);
 }
 
-static void yaffs_init_tnodes_and_objs(yaffs_dev_t *dev)
+static int yaffs_generic_obj_del(struct yaffs_obj *in)
+{
+       /* Iinvalidate the file's data in the cache, without flushing. */
+       yaffs_invalidate_whole_cache(in);
+
+       if (in->my_dev->param.is_yaffs2 && in->parent != in->my_dev->del_dir) {
+               /* Move to unlinked directory so we have a deletion record */
+               yaffs_change_obj_name(in, in->my_dev->del_dir, _Y("deleted"), 0,
+                                     0);
+       }
+
+       yaffs_remove_obj_from_dir(in);
+       yaffs_chunk_del(in->my_dev, in->hdr_chunk, 1, __LINE__);
+       in->hdr_chunk = 0;
+
+       yaffs_free_obj(in);
+       return YAFFS_OK;
+
+}
+
+static void yaffs_soft_del_file(struct yaffs_obj *obj)
+{
+       if (!obj->deleted ||
+           obj->variant_type != YAFFS_OBJECT_TYPE_FILE ||
+           obj->soft_del)
+               return;
+
+       if (obj->n_data_chunks <= 0) {
+               /* Empty file with no duplicate object headers,
+                * just delete it immediately */
+               yaffs_free_tnode(obj->my_dev, obj->variant.file_variant.top);
+               obj->variant.file_variant.top = NULL;
+               yaffs_trace(YAFFS_TRACE_TRACING,
+                       "yaffs: Deleting empty file %d",
+                       obj->obj_id);
+               yaffs_generic_obj_del(obj);
+       } else {
+               yaffs_soft_del_worker(obj,
+                                     obj->variant.file_variant.top,
+                                     obj->variant.
+                                     file_variant.top_level, 0);
+               obj->soft_del = 1;
+       }
+}
+
+/* Pruning removes any part of the file structure tree that is beyond the
+ * bounds of the file (ie that does not point to chunks).
+ *
+ * A file should only get pruned when its size is reduced.
+ *
+ * Before pruning, the chunks must be pulled from the tree and the
+ * level 0 tnode entries must be zeroed out.
+ * Could also use this for file deletion, but that's probably better handled
+ * by a special case.
+ *
+ * This function is recursive. For levels > 0 the function is called again on
+ * any sub-tree. For level == 0 we just check if the sub-tree has data.
+ * If there is no data in a subtree then it is pruned.
+ */
+
+static struct yaffs_tnode *yaffs_prune_worker(struct yaffs_dev *dev,
+                                             struct yaffs_tnode *tn, u32 level,
+                                             int del0)
+{
+       int i;
+       int has_data;
+
+       if (!tn)
+               return tn;
+
+       has_data = 0;
+
+       if (level > 0) {
+               for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
+                       if (tn->internal[i]) {
+                               tn->internal[i] =
+                                   yaffs_prune_worker(dev,
+                                               tn->internal[i],
+                                               level - 1,
+                                               (i == 0) ? del0 : 1);
+                       }
+
+                       if (tn->internal[i])
+                               has_data++;
+               }
+       } else {
+               int tnode_size_u32 = dev->tnode_size / sizeof(u32);
+               u32 *map = (u32 *) tn;
+
+               for (i = 0; !has_data && i < tnode_size_u32; i++) {
+                       if (map[i])
+                               has_data++;
+               }
+       }
+
+       if (has_data == 0 && del0) {
+               /* Free and return NULL */
+               yaffs_free_tnode(dev, tn);
+               tn = NULL;
+       }
+       return tn;
+}
+
+static int yaffs_prune_tree(struct yaffs_dev *dev,
+                           struct yaffs_file_var *file_struct)
 {
        int i;
+       int has_data;
+       int done = 0;
+       struct yaffs_tnode *tn;
 
-       dev->n_obj = 0;
-       dev->n_tnodes = 0;
+       if (file_struct->top_level < 1)
+               return YAFFS_OK;
 
-       yaffs_init_raw_tnodes_and_objs(dev);
+       file_struct->top =
+          yaffs_prune_worker(dev, file_struct->top, file_struct->top_level, 0);
 
-       for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-               YINIT_LIST_HEAD(&dev->obj_bucket[i].list);
-               dev->obj_bucket[i].count = 0;
+       /* Now we have a tree with all the non-zero branches NULL but
+        * the height is the same as it was.
+        * Let's see if we can trim internal tnodes to shorten the tree.
+        * We can do this if only the 0th element in the tnode is in use
+        * (ie all the non-zero are NULL)
+        */
+
+       while (file_struct->top_level && !done) {
+               tn = file_struct->top;
+
+               has_data = 0;
+               for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
+                       if (tn->internal[i])
+                               has_data++;
+               }
+
+               if (!has_data) {
+                       file_struct->top = tn->internal[0];
+                       file_struct->top_level--;
+                       yaffs_free_tnode(dev, tn);
+               } else {
+                       done = 1;
+               }
        }
+
+       return YAFFS_OK;
 }
 
-static int yaffs_find_nice_bucket(yaffs_dev_t *dev)
+/*-------------------- End of File Structure functions.-------------------*/
+
+/* alloc_empty_obj gets us a clean Object.*/
+static struct yaffs_obj *yaffs_alloc_empty_obj(struct yaffs_dev *dev)
+{
+       struct yaffs_obj *obj = yaffs_alloc_raw_obj(dev);
+
+       if (!obj)
+               return obj;
+
+       dev->n_obj++;
+
+       /* Now sweeten it up... */
+
+       memset(obj, 0, sizeof(struct yaffs_obj));
+       obj->being_created = 1;
+
+       obj->my_dev = dev;
+       obj->hdr_chunk = 0;
+       obj->variant_type = YAFFS_OBJECT_TYPE_UNKNOWN;
+       INIT_LIST_HEAD(&(obj->hard_links));
+       INIT_LIST_HEAD(&(obj->hash_link));
+       INIT_LIST_HEAD(&obj->siblings);
+
+       /* Now make the directory sane */
+       if (dev->root_dir) {
+               obj->parent = dev->root_dir;
+               list_add(&(obj->siblings),
+                        &dev->root_dir->variant.dir_variant.children);
+       }
+
+       /* Add it to the lost and found directory.
+        * NB Can't put root or lost-n-found in lost-n-found so
+        * check if lost-n-found exists first
+        */
+       if (dev->lost_n_found)
+               yaffs_add_obj_to_dir(dev->lost_n_found, obj);
+
+       obj->being_created = 0;
+
+       dev->checkpoint_blocks_required = 0;    /* force recalculation */
+
+       return obj;
+}
+
+static int yaffs_find_nice_bucket(struct yaffs_dev *dev)
 {
        int i;
        int l = 999;
        int lowest = 999999;
 
-
        /* Search for the shortest list or one that
         * isn't too long.
         */
@@ -1365,82 +1851,72 @@ static int yaffs_find_nice_bucket(yaffs_dev_t *dev)
                        lowest = dev->obj_bucket[dev->bucket_finder].count;
                        l = dev->bucket_finder;
                }
-
        }
 
        return l;
 }
 
-static int yaffs_new_obj_id(yaffs_dev_t *dev)
+static int yaffs_new_obj_id(struct yaffs_dev *dev)
 {
        int bucket = yaffs_find_nice_bucket(dev);
+       int found = 0;
+       struct list_head *i;
+       u32 n = (u32) bucket;
 
        /* Now find an object value that has not already been taken
         * by scanning the list.
         */
 
-       int found = 0;
-       struct ylist_head *i;
-
-       __u32 n = (__u32) bucket;
-
-       /* yaffs_check_obj_hash_sane();  */
-
        while (!found) {
                found = 1;
                n += YAFFS_NOBJECT_BUCKETS;
                if (1 || dev->obj_bucket[bucket].count > 0) {
-                       ylist_for_each(i, &dev->obj_bucket[bucket].list) {
+                       list_for_each(i, &dev->obj_bucket[bucket].list) {
                                /* If there is already one in the list */
-                               if (i && ylist_entry(i, yaffs_obj_t,
-                                               hash_link)->obj_id == n) {
+                               if (i && list_entry(i, struct yaffs_obj,
+                                                   hash_link)->obj_id == n) {
                                        found = 0;
                                }
                        }
                }
        }
-
        return n;
 }
 
-static void yaffs_hash_obj(yaffs_obj_t *in)
+static void yaffs_hash_obj(struct yaffs_obj *in)
 {
        int bucket = yaffs_hash_fn(in->obj_id);
-       yaffs_dev_t *dev = in->my_dev;
+       struct yaffs_dev *dev = in->my_dev;
 
-       ylist_add(&in->hash_link, &dev->obj_bucket[bucket].list);
+       list_add(&in->hash_link, &dev->obj_bucket[bucket].list);
        dev->obj_bucket[bucket].count++;
 }
 
-yaffs_obj_t *yaffs_find_by_number(yaffs_dev_t *dev, __u32 number)
+struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number)
 {
        int bucket = yaffs_hash_fn(number);
-       struct ylist_head *i;
-       yaffs_obj_t *in;
+       struct list_head *i;
+       struct yaffs_obj *in;
 
-       ylist_for_each(i, &dev->obj_bucket[bucket].list) {
+       list_for_each(i, &dev->obj_bucket[bucket].list) {
                /* Look if it is in the list */
-               if (i) {
-                       in = ylist_entry(i, yaffs_obj_t, hash_link);
-                       if (in->obj_id == number) {
-
-                               /* Don't tell the VFS about this one if it is defered free */
-                               if (in->defered_free)
-                                       return NULL;
-
-                               return in;
-                       }
+               in = list_entry(i, struct yaffs_obj, hash_link);
+               if (in->obj_id == number) {
+                       /* Don't show if it is defered free */
+                       if (in->defered_free)
+                               return NULL;
+                       return in;
                }
        }
 
        return NULL;
 }
 
-yaffs_obj_t *yaffs_new_obj(yaffs_dev_t *dev, int number,
-                                   yaffs_obj_type type)
+static struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number,
+                               enum yaffs_obj_type type)
 {
-       yaffs_obj_t *theObject=NULL;
-       yaffs_tnode_t *tn = NULL;
+       struct yaffs_obj *the_obj = NULL;
+       struct yaffs_tnode *tn = NULL;
 
        if (number < 0)
                number = yaffs_new_obj_id(dev);
@@ -1451,876 +1927,666 @@ yaffs_obj_t *yaffs_new_obj(yaffs_dev_t *dev, int number,
                        return NULL;
        }
 
-       theObject = yaffs_alloc_empty_obj(dev);
-       if (!theObject){
-               if(tn)
-                       yaffs_free_tnode(dev,tn);
+       the_obj = yaffs_alloc_empty_obj(dev);
+       if (!the_obj) {
+               if (tn)
+                       yaffs_free_tnode(dev, tn);
                return NULL;
        }
 
+       the_obj->fake = 0;
+       the_obj->rename_allowed = 1;
+       the_obj->unlink_allowed = 1;
+       the_obj->obj_id = number;
+       yaffs_hash_obj(the_obj);
+       the_obj->variant_type = type;
+       yaffs_load_current_time(the_obj, 1, 1);
 
-       if (theObject) {
-               theObject->fake = 0;
-               theObject->rename_allowed = 1;
-               theObject->unlink_allowed = 1;
-               theObject->obj_id = number;
-               yaffs_hash_obj(theObject);
-               theObject->variant_type = type;
-#ifdef CONFIG_YAFFS_WINCE
-               yfsd_win_file_time_now(theObject->win_atime);
-               theObject->win_ctime[0] = theObject->win_mtime[0] =
-                   theObject->win_atime[0];
-               theObject->win_ctime[1] = theObject->win_mtime[1] =
-                   theObject->win_atime[1];
+       switch (type) {
+       case YAFFS_OBJECT_TYPE_FILE:
+               the_obj->variant.file_variant.file_size = 0;
+               the_obj->variant.file_variant.scanned_size = 0;
+               the_obj->variant.file_variant.shrink_size =
+                                               yaffs_max_file_size(dev);
+               the_obj->variant.file_variant.top_level = 0;
+               the_obj->variant.file_variant.top = tn;
+               break;
+       case YAFFS_OBJECT_TYPE_DIRECTORY:
+               INIT_LIST_HEAD(&the_obj->variant.dir_variant.children);
+               INIT_LIST_HEAD(&the_obj->variant.dir_variant.dirty);
+               break;
+       case YAFFS_OBJECT_TYPE_SYMLINK:
+       case YAFFS_OBJECT_TYPE_HARDLINK:
+       case YAFFS_OBJECT_TYPE_SPECIAL:
+               /* No action required */
+               break;
+       case YAFFS_OBJECT_TYPE_UNKNOWN:
+               /* todo this should not happen */
+               break;
+       }
+       return the_obj;
+}
 
-#else
+static struct yaffs_obj *yaffs_create_fake_dir(struct yaffs_dev *dev,
+                                              int number, u32 mode)
+{
 
-               theObject->yst_atime = theObject->yst_mtime =
-                   theObject->yst_ctime = Y_CURRENT_TIME;
-#endif
-               switch (type) {
-               case YAFFS_OBJECT_TYPE_FILE:
-                       theObject->variant.file_variant.file_size = 0;
-                       theObject->variant.file_variant.scanned_size = 0;
-                       theObject->variant.file_variant.shrink_size = 0xFFFFFFFF;       /* max __u32 */
-                       theObject->variant.file_variant.top_level = 0;
-                       theObject->variant.file_variant.top = tn;
-                       break;
-               case YAFFS_OBJECT_TYPE_DIRECTORY:
-                       YINIT_LIST_HEAD(&theObject->variant.dir_variant.
-                                       children);
-                       YINIT_LIST_HEAD(&theObject->variant.dir_variant.
-                                       dirty);
-                       break;
-               case YAFFS_OBJECT_TYPE_SYMLINK:
-               case YAFFS_OBJECT_TYPE_HARDLINK:
-               case YAFFS_OBJECT_TYPE_SPECIAL:
-                       /* No action required */
-                       break;
-               case YAFFS_OBJECT_TYPE_UNKNOWN:
-                       /* todo this should not happen */
-                       break;
-               }
-       }
+       struct yaffs_obj *obj =
+           yaffs_new_obj(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
+
+       if (!obj)
+               return NULL;
+
+       obj->fake = 1;  /* it is fake so it might not use NAND */
+       obj->rename_allowed = 0;
+       obj->unlink_allowed = 0;
+       obj->deleted = 0;
+       obj->unlinked = 0;
+       obj->yst_mode = mode;
+       obj->my_dev = dev;
+       obj->hdr_chunk = 0;     /* Not a valid chunk. */
+       return obj;
+
+}
+
+
+static void yaffs_init_tnodes_and_objs(struct yaffs_dev *dev)
+{
+       int i;
+
+       dev->n_obj = 0;
+       dev->n_tnodes = 0;
+       yaffs_init_raw_tnodes_and_objs(dev);
 
-       return theObject;
+       for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
+               INIT_LIST_HEAD(&dev->obj_bucket[i].list);
+               dev->obj_bucket[i].count = 0;
+       }
 }
 
-yaffs_obj_t *yaffs_find_or_create_by_number(yaffs_dev_t *dev,
-                                               int number,
-                                               yaffs_obj_type type)
+struct yaffs_obj *yaffs_find_or_create_by_number(struct yaffs_dev *dev,
+                                                int number,
+                                                enum yaffs_obj_type type)
 {
-       yaffs_obj_t *theObject = NULL;
+       struct yaffs_obj *the_obj = NULL;
 
        if (number > 0)
-               theObject = yaffs_find_by_number(dev, number);
+               the_obj = yaffs_find_by_number(dev, number);
 
-       if (!theObject)
-               theObject = yaffs_new_obj(dev, number, type);
+       if (!the_obj)
+               the_obj = yaffs_new_obj(dev, number, type);
 
-       return theObject;
+       return the_obj;
 
 }
 
-
 YCHAR *yaffs_clone_str(const YCHAR *str)
 {
-       YCHAR *newStr = NULL;
+       YCHAR *new_str = NULL;
        int len;
 
        if (!str)
                str = _Y("");
 
-       len = yaffs_strnlen(str,YAFFS_MAX_ALIAS_LENGTH);
-       newStr = YMALLOC((len + 1) * sizeof(YCHAR));
-       if (newStr){
-               yaffs_strncpy(newStr, str,len);
-               newStr[len] = 0;
+       len = strnlen(str, YAFFS_MAX_ALIAS_LENGTH);
+       new_str = kmalloc((len + 1) * sizeof(YCHAR), GFP_NOFS);
+       if (new_str) {
+               strncpy(new_str, str, len);
+               new_str[len] = 0;
+       }
+       return new_str;
+
+}
+/*
+ *yaffs_update_parent() handles fixing a directories mtime and ctime when a new
+ * link (ie. name) is created or deleted in the directory.
+ *
+ * ie.
+ *   create dir/a : update dir's mtime/ctime
+ *   rm dir/a:   update dir's mtime/ctime
+ *   modify dir/a: don't update dir's mtimme/ctime
+ *
+ * This can be handled immediately or defered. Defering helps reduce the number
+ * of updates when many files in a directory are changed within a brief period.
+ *
+ * If the directory updating is defered then yaffs_update_dirty_dirs must be
+ * called periodically.
+ */
+
+static void yaffs_update_parent(struct yaffs_obj *obj)
+{
+       struct yaffs_dev *dev;
+
+       if (!obj)
+               return;
+       dev = obj->my_dev;
+       obj->dirty = 1;
+       yaffs_load_current_time(obj, 0, 1);
+       if (dev->param.defered_dir_update) {
+               struct list_head *link = &obj->variant.dir_variant.dirty;
+
+               if (list_empty(link)) {
+                       list_add(link, &dev->dirty_dirs);
+                       yaffs_trace(YAFFS_TRACE_BACKGROUND,
+                         "Added object %d to dirty directories",
+                          obj->obj_id);
+               }
+
+       } else {
+               yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
        }
-       return newStr;
+}
+
+void yaffs_update_dirty_dirs(struct yaffs_dev *dev)
+{
+       struct list_head *link;
+       struct yaffs_obj *obj;
+       struct yaffs_dir_var *d_s;
+       union yaffs_obj_var *o_v;
+
+       yaffs_trace(YAFFS_TRACE_BACKGROUND, "Update dirty directories");
 
+       while (!list_empty(&dev->dirty_dirs)) {
+               link = dev->dirty_dirs.next;
+               list_del_init(link);
+
+               d_s = list_entry(link, struct yaffs_dir_var, dirty);
+               o_v = list_entry(d_s, union yaffs_obj_var, dir_variant);
+               obj = list_entry(o_v, struct yaffs_obj, variant);
+
+               yaffs_trace(YAFFS_TRACE_BACKGROUND, "Update directory %d",
+                       obj->obj_id);
+
+               if (obj->dirty)
+                       yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
+       }
 }
 
 /*
  * Mknod (create) a new object.
  * equiv_obj only has meaning for a hard link;
- * aliasString only has meaning for a symlink.
+ * alias_str only has meaning for a symlink.
  * rdev only has meaning for devices (a subset of special objects)
  */
 
-static yaffs_obj_t *yaffs_create_obj(yaffs_obj_type type,
-                                      yaffs_obj_t *parent,
-                                      const YCHAR *name,
-                                      __u32 mode,
-                                      __u32 uid,
-                                      __u32 gid,
-                                      yaffs_obj_t *equiv_obj,
-                                      const YCHAR *aliasString, __u32 rdev)
+static struct yaffs_obj *yaffs_create_obj(enum yaffs_obj_type type,
+                                         struct yaffs_obj *parent,
+                                         const YCHAR *name,
+                                         u32 mode,
+                                         u32 uid,
+                                         u32 gid,
+                                         struct yaffs_obj *equiv_obj,
+                                         const YCHAR *alias_str, u32 rdev)
 {
-       yaffs_obj_t *in;
+       struct yaffs_obj *in;
        YCHAR *str = NULL;
+       struct yaffs_dev *dev = parent->my_dev;
 
-       yaffs_dev_t *dev = parent->my_dev;
-
-       /* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
+       /* Check if the entry exists.
+        * If it does then fail the call since we don't want a dup. */
        if (yaffs_find_by_name(parent, name))
                return NULL;
 
        if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
-               str = yaffs_clone_str(aliasString);
+               str = yaffs_clone_str(alias_str);
                if (!str)
                        return NULL;
        }
 
        in = yaffs_new_obj(dev, -1, type);
 
-       if (!in){
-               if(str)
-                       YFREE(str);
+       if (!in) {
+               kfree(str);
                return NULL;
        }
 
+       in->hdr_chunk = 0;
+       in->valid = 1;
+       in->variant_type = type;
 
+       in->yst_mode = mode;
 
+       yaffs_attribs_init(in, gid, uid, rdev);
 
+       in->n_data_chunks = 0;
 
-       if (in) {
-               in->hdr_chunk = 0;
-               in->valid = 1;
-               in->variant_type = type;
-
-               in->yst_mode = mode;
-
-#ifdef CONFIG_YAFFS_WINCE
-               yfsd_win_file_time_now(in->win_atime);
-               in->win_ctime[0] = in->win_mtime[0] = in->win_atime[0];
-               in->win_ctime[1] = in->win_mtime[1] = in->win_atime[1];
-
-#else
-               in->yst_atime = in->yst_mtime = in->yst_ctime = Y_CURRENT_TIME;
-
-               in->yst_rdev = rdev;
-               in->yst_uid = uid;
-               in->yst_gid = gid;
-#endif
-               in->n_data_chunks = 0;
-
-               yaffs_set_obj_name(in, name);
-               in->dirty = 1;
+       yaffs_set_obj_name(in, name);
+       in->dirty = 1;
 
-               yaffs_add_obj_to_dir(parent, in);
+       yaffs_add_obj_to_dir(parent, in);
 
-               in->my_dev = parent->my_dev;
+       in->my_dev = parent->my_dev;
 
-               switch (type) {
-               case YAFFS_OBJECT_TYPE_SYMLINK:
-                       in->variant.symlink_variant.alias = str;
-                       break;
-               case YAFFS_OBJECT_TYPE_HARDLINK:
-                       in->variant.hardlink_variant.equiv_obj =
-                               equiv_obj;
-                       in->variant.hardlink_variant.equiv_id =
-                               equiv_obj->obj_id;
-                       ylist_add(&in->hard_links, &equiv_obj->hard_links);
-                       break;
-               case YAFFS_OBJECT_TYPE_FILE:
-               case YAFFS_OBJECT_TYPE_DIRECTORY:
-               case YAFFS_OBJECT_TYPE_SPECIAL:
-               case YAFFS_OBJECT_TYPE_UNKNOWN:
-                       /* do nothing */
-                       break;
-               }
+       switch (type) {
+       case YAFFS_OBJECT_TYPE_SYMLINK:
+               in->variant.symlink_variant.alias = str;
+               break;
+       case YAFFS_OBJECT_TYPE_HARDLINK:
+               in->variant.hardlink_variant.equiv_obj = equiv_obj;
+               in->variant.hardlink_variant.equiv_id = equiv_obj->obj_id;
+               list_add(&in->hard_links, &equiv_obj->hard_links);
+               break;
+       case YAFFS_OBJECT_TYPE_FILE:
+       case YAFFS_OBJECT_TYPE_DIRECTORY:
+       case YAFFS_OBJECT_TYPE_SPECIAL:
+       case YAFFS_OBJECT_TYPE_UNKNOWN:
+               /* do nothing */
+               break;
+       }
 
-               if (yaffs_update_oh(in, name, 0, 0, 0, NULL) < 0) {
-                       /* Could not create the object header, fail the creation */
-                       yaffs_del_obj(in);
-                       in = NULL;
-               }
+       if (yaffs_update_oh(in, name, 0, 0, 0, NULL) < 0) {
+               /* Could not create the object header, fail */
+               yaffs_del_obj(in);
+               in = NULL;
+       }
 
+       if (in)
                yaffs_update_parent(parent);
-       }
 
        return in;
 }
 
-yaffs_obj_t *yaffs_create_file(yaffs_obj_t *parent, const YCHAR *name,
-                       __u32 mode, __u32 uid, __u32 gid)
+struct yaffs_obj *yaffs_create_file(struct yaffs_obj *parent,
+                                   const YCHAR *name, u32 mode, u32 uid,
+                                   u32 gid)
 {
        return yaffs_create_obj(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
                                uid, gid, NULL, NULL, 0);
 }
 
-yaffs_obj_t *yaffs_create_dir(yaffs_obj_t *parent, const YCHAR *name,
-                               __u32 mode, __u32 uid, __u32 gid)
+struct yaffs_obj *yaffs_create_dir(struct yaffs_obj *parent, const YCHAR *name,
+                                  u32 mode, u32 uid, u32 gid)
 {
        return yaffs_create_obj(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
-                                mode, uid, gid, NULL, NULL, 0);
+                               mode, uid, gid, NULL, NULL, 0);
 }
 
-yaffs_obj_t *yaffs_create_special(yaffs_obj_t *parent, const YCHAR *name,
-                               __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
+struct yaffs_obj *yaffs_create_special(struct yaffs_obj *parent,
+                                      const YCHAR *name, u32 mode, u32 uid,
+                                      u32 gid, u32 rdev)
 {
        return yaffs_create_obj(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
-                                uid, gid, NULL, NULL, rdev);
+                               uid, gid, NULL, NULL, rdev);
 }
 
-yaffs_obj_t *yaffs_create_symlink(yaffs_obj_t *parent, const YCHAR *name,
-                               __u32 mode, __u32 uid, __u32 gid,
-                               const YCHAR *alias)
+struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent,
+                                      const YCHAR *name, u32 mode, u32 uid,
+                                      u32 gid, const YCHAR *alias)
 {
        return yaffs_create_obj(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
                                uid, gid, NULL, alias, 0);
 }
 
 /* yaffs_link_obj returns the object id of the equivalent object.*/
-yaffs_obj_t *yaffs_link_obj(yaffs_obj_t *parent, const YCHAR *name,
-                       yaffs_obj_t *equiv_obj)
+struct yaffs_obj *yaffs_link_obj(struct yaffs_obj *parent, const YCHAR * name,
+                                struct yaffs_obj *equiv_obj)
 {
-       /* Get the real object in case we were fed a hard link as an equivalent object */
+       /* Get the real object in case we were fed a hard link obj */
        equiv_obj = yaffs_get_equivalent_obj(equiv_obj);
 
-       if (yaffs_create_obj
-           (YAFFS_OBJECT_TYPE_HARDLINK, parent, name, 0, 0, 0,
-            equiv_obj, NULL, 0)) {
+       if (yaffs_create_obj(YAFFS_OBJECT_TYPE_HARDLINK,
+                       parent, name, 0, 0, 0,
+                       equiv_obj, NULL, 0))
                return equiv_obj;
-       } else {
-               return NULL;
-       }
-
-}
-
-static int yaffs_change_obj_name(yaffs_obj_t *obj, yaffs_obj_t *new_dir,
-                               const YCHAR *new_name, int force, int shadows)
-{
-       int unlinkOp;
-       int deleteOp;
-
-       yaffs_obj_t *existingTarget;
-
-       if (new_dir == NULL)
-               new_dir = obj->parent;  /* use the old directory */
-
-       if (new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR
-                  ("tragedy: yaffs_change_obj_name: new_dir is not a directory"
-                   TENDSTR)));
-               YBUG();
-       }
-
-       /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
-       if (obj->my_dev->param.is_yaffs2)
-               unlinkOp = (new_dir == obj->my_dev->unlinked_dir);
-       else
-               unlinkOp = (new_dir == obj->my_dev->unlinked_dir
-                           && obj->variant_type == YAFFS_OBJECT_TYPE_FILE);
-
-       deleteOp = (new_dir == obj->my_dev->del_dir);
 
-       existingTarget = yaffs_find_by_name(new_dir, new_name);
-
-       /* If the object is a file going into the unlinked directory,
-        *   then it is OK to just stuff it in since duplicate names are allowed.
-        *   else only proceed if the new name does not exist and if we're putting
-        *   it into a directory.
-        */
-       if ((unlinkOp ||
-            deleteOp ||
-            force ||
-            (shadows > 0) ||
-            !existingTarget) &&
-           new_dir->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) {
-               yaffs_set_obj_name(obj, new_name);
-               obj->dirty = 1;
-
-               yaffs_add_obj_to_dir(new_dir, obj);
-
-               if (unlinkOp)
-                       obj->unlinked = 1;
-
-               /* If it is a deletion then we mark it as a shrink for gc purposes. */
-               if (yaffs_update_oh(obj, new_name, 0, deleteOp, shadows, NULL) >= 0)
-                       return YAFFS_OK;
-       }
+       return NULL;
 
-       return YAFFS_FAIL;
 }
 
-int yaffs_rename_obj(yaffs_obj_t *old_dir, const YCHAR *old_name,
-               yaffs_obj_t *new_dir, const YCHAR *new_name)
-{
-       yaffs_obj_t *obj = NULL;
-       yaffs_obj_t *existingTarget = NULL;
-       int force = 0;
-       int result;
-       yaffs_dev_t *dev;
-
-
-       if (!old_dir || old_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
-               YBUG();
-       if (!new_dir || new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
-               YBUG();
-
-       dev = old_dir->my_dev;
-
-#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
-       /* Special case for case insemsitive systems (eg. WinCE).
-        * While look-up is case insensitive, the name isn't.
-        * Therefore we might want to change x.txt to X.txt
-       */
-       if (old_dir == new_dir && yaffs_strcmp(old_name, new_name) == 0)
-               force = 1;
-#endif
-
-       if(yaffs_strnlen(new_name,YAFFS_MAX_NAME_LENGTH+1) > YAFFS_MAX_NAME_LENGTH)
-               /* ENAMETOOLONG */
-               return YAFFS_FAIL;
 
-       obj = yaffs_find_by_name(old_dir, old_name);
 
-       if (obj && obj->rename_allowed) {
+/*---------------------- Block Management and Page Allocation -------------*/
 
-               /* Now do the handling for an existing target, if there is one */
+static void yaffs_deinit_blocks(struct yaffs_dev *dev)
+{
+       if (dev->block_info_alt && dev->block_info)
+               vfree(dev->block_info);
+       else
+               kfree(dev->block_info);
 
-               existingTarget = yaffs_find_by_name(new_dir, new_name);
-               if (existingTarget &&
-                       existingTarget->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
-                       !ylist_empty(&existingTarget->variant.dir_variant.children)) {
-                       /* There is a target that is a non-empty directory, so we fail */
-                       return YAFFS_FAIL;      /* EEXIST or ENOTEMPTY */
-               } else if (existingTarget && existingTarget != obj) {
-                       /* Nuke the target first, using shadowing,
-                        * but only if it isn't the same object.
-                        *
-                        * Note we must disable gc otherwise it can mess up the shadowing.
-                        *
-                        */
-                       dev->gc_disable=1;
-                       yaffs_change_obj_name(obj, new_dir, new_name, force,
-                                               existingTarget->obj_id);
-                       existingTarget->is_shadowed = 1;
-                       yaffs_unlink_obj(existingTarget);
-                       dev->gc_disable=0;
-               }
+       dev->block_info_alt = 0;
 
-               result = yaffs_change_obj_name(obj, new_dir, new_name, 1, 0);
+       dev->block_info = NULL;
 
-               yaffs_update_parent(old_dir);
-               if(new_dir != old_dir)
-                       yaffs_update_parent(new_dir);
-               
-               return result;
-       }
-       return YAFFS_FAIL;
+       if (dev->chunk_bits_alt && dev->chunk_bits)
+               vfree(dev->chunk_bits);
+       else
+               kfree(dev->chunk_bits);
+       dev->chunk_bits_alt = 0;
+       dev->chunk_bits = NULL;
 }
 
-/*------------------------- Block Management and Page Allocation ----------------*/
-
-static int yaffs_init_blocks(yaffs_dev_t *dev)
+static int yaffs_init_blocks(struct yaffs_dev *dev)
 {
-       int nBlocks = dev->internal_end_block - dev->internal_start_block + 1;
+       int n_blocks = dev->internal_end_block - dev->internal_start_block + 1;
 
        dev->block_info = NULL;
        dev->chunk_bits = NULL;
-
        dev->alloc_block = -1;  /* force it to get a new one */
 
        /* If the first allocation strategy fails, thry the alternate one */
-       dev->block_info = YMALLOC(nBlocks * sizeof(yaffs_block_info_t));
+       dev->block_info =
+               kmalloc(n_blocks * sizeof(struct yaffs_block_info), GFP_NOFS);
        if (!dev->block_info) {
-               dev->block_info = YMALLOC_ALT(nBlocks * sizeof(yaffs_block_info_t));
+               dev->block_info =
+                   vmalloc(n_blocks * sizeof(struct yaffs_block_info));
                dev->block_info_alt = 1;
-       } else
+       } else {
                dev->block_info_alt = 0;
-
-       if (dev->block_info) {
-               /* Set up dynamic blockinfo stuff. */
-               dev->chunk_bit_stride = (dev->param.chunks_per_block + 7) / 8; /* round up bytes */
-               dev->chunk_bits = YMALLOC(dev->chunk_bit_stride * nBlocks);
-               if (!dev->chunk_bits) {
-                       dev->chunk_bits = YMALLOC_ALT(dev->chunk_bit_stride * nBlocks);
-                       dev->chunk_bits_alt = 1;
-               } else
-                       dev->chunk_bits_alt = 0;
-       }
-
-       if (dev->block_info && dev->chunk_bits) {
-               memset(dev->block_info, 0, nBlocks * sizeof(yaffs_block_info_t));
-               memset(dev->chunk_bits, 0, dev->chunk_bit_stride * nBlocks);
-               return YAFFS_OK;
        }
 
-       return YAFFS_FAIL;
-}
+       if (!dev->block_info)
+               goto alloc_error;
 
-static void yaffs_deinit_blocks(yaffs_dev_t *dev)
-{
-       if (dev->block_info_alt && dev->block_info)
-               YFREE_ALT(dev->block_info);
-       else if (dev->block_info)
-               YFREE(dev->block_info);
+       /* Set up dynamic blockinfo stuff. Round up bytes. */
+       dev->chunk_bit_stride = (dev->param.chunks_per_block + 7) / 8;
+       dev->chunk_bits =
+               kmalloc(dev->chunk_bit_stride * n_blocks, GFP_NOFS);
+       if (!dev->chunk_bits) {
+               dev->chunk_bits =
+                   vmalloc(dev->chunk_bit_stride * n_blocks);
+               dev->chunk_bits_alt = 1;
+       } else {
+               dev->chunk_bits_alt = 0;
+       }
+       if (!dev->chunk_bits)
+               goto alloc_error;
 
-       dev->block_info_alt = 0;
 
-       dev->block_info = NULL;
+       memset(dev->block_info, 0, n_blocks * sizeof(struct yaffs_block_info));
+       memset(dev->chunk_bits, 0, dev->chunk_bit_stride * n_blocks);
+       return YAFFS_OK;
 
-       if (dev->chunk_bits_alt && dev->chunk_bits)
-               YFREE_ALT(dev->chunk_bits);
-       else if (dev->chunk_bits)
-               YFREE(dev->chunk_bits);
-       dev->chunk_bits_alt = 0;
-       dev->chunk_bits = NULL;
+alloc_error:
+       yaffs_deinit_blocks(dev);
+       return YAFFS_FAIL;
 }
 
-void yaffs_block_became_dirty(yaffs_dev_t *dev, int block_no)
-{
-       yaffs_block_info_t *bi = yaffs_get_block_info(dev, block_no);
 
-       int erasedOk = 0;
+void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no)
+{
+       struct yaffs_block_info *bi = yaffs_get_block_info(dev, block_no);
+       int erased_ok = 0;
+       int i;
 
        /* If the block is still healthy erase it and mark as clean.
         * If the block has had a data failure, then retire it.
         */
 
-       T(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE,
-               (TSTR("yaffs_block_became_dirty block %d state %d %s"TENDSTR),
-               block_no, bi->block_state, (bi->needs_retiring) ? "needs retiring" : ""));
+       yaffs_trace(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE,
+               "yaffs_block_became_dirty block %d state %d %s",
+               block_no, bi->block_state,
+               (bi->needs_retiring) ? "needs retiring" : "");
 
-       yaffs2_clear_oldest_dirty_seq(dev,bi);
+       yaffs2_clear_oldest_dirty_seq(dev, bi);
 
        bi->block_state = YAFFS_BLOCK_STATE_DIRTY;
 
-       /* If this is the block being garbage collected then stop gc'ing this block */
-       if(block_no == dev->gc_block)
+       /* If this is the block being garbage collected then stop gc'ing */
+       if (block_no == dev->gc_block)
                dev->gc_block = 0;
 
-       /* If this block is currently the best candidate for gc then drop as a candidate */
-       if(block_no == dev->gc_dirtiest){
+       /* If this block is currently the best candidate for gc
+        * then drop as a candidate */
+       if (block_no == dev->gc_dirtiest) {
                dev->gc_dirtiest = 0;
                dev->gc_pages_in_use = 0;
        }
 
-       if (!bi->needs_retiring) {
-               yaffs2_checkpt_invalidate(dev);
-               erasedOk = yaffs_erase_block(dev, block_no);
-               if (!erasedOk) {
-                       dev->n_erase_failures++;
-                       T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-                         (TSTR("**>> Erasure failed %d" TENDSTR), block_no));
-               }
-       }
-
-       if (erasedOk &&
-           ((yaffs_trace_mask & YAFFS_TRACE_ERASE) || !yaffs_skip_verification(dev))) {
-               int i;
-               for (i = 0; i < dev->param.chunks_per_block; i++) {
-                       if (!yaffs_check_chunk_erased
-                           (dev, block_no * dev->param.chunks_per_block + i)) {
-                               T(YAFFS_TRACE_ERROR,
-                                 (TSTR
-                                  (">>Block %d erasure supposedly OK, but chunk %d not erased"
-                                   TENDSTR), block_no, i));
-                       }
-               }
-       }
-
-       if (erasedOk) {
-               /* Clean it up... */
-               bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
-               bi->seq_number = 0;
-               dev->n_erased_blocks++;
-               bi->pages_in_use = 0;
-               bi->soft_del_pages = 0;
-               bi->has_shrink_hdr = 0;
-               bi->skip_erased_check = 1;  /* This is clean, so no need to check */
-               bi->gc_prioritise = 0;
-               yaffs_clear_chunk_bits(dev, block_no);
-
-               T(YAFFS_TRACE_ERASE,
-                 (TSTR("Erased block %d" TENDSTR), block_no));
-       } else {
-               dev->n_free_chunks -= dev->param.chunks_per_block;      /* We lost a block of free space */
-
-               yaffs_retire_block(dev, block_no);
-               T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-                 (TSTR("**>> Block %d retired" TENDSTR), block_no));
-       }
-}
-
-static int yaffs_find_alloc_block(yaffs_dev_t *dev)
-{
-       int i;
-
-       yaffs_block_info_t *bi;
-
-       if (dev->n_erased_blocks < 1) {
-               /* Hoosterman we've got a problem.
-                * Can't get space to gc
-                */
-               T(YAFFS_TRACE_ERROR,
-                 (TSTR("yaffs tragedy: no more erased blocks" TENDSTR)));
-
-               return -1;
-       }
-
-       /* Find an empty block. */
-
-       for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-               dev->alloc_block_finder++;
-               if (dev->alloc_block_finder < dev->internal_start_block
-                   || dev->alloc_block_finder > dev->internal_end_block) {
-                       dev->alloc_block_finder = dev->internal_start_block;
-               }
-
-               bi = yaffs_get_block_info(dev, dev->alloc_block_finder);
-
-               if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
-                       bi->block_state = YAFFS_BLOCK_STATE_ALLOCATING;
-                       dev->seq_number++;
-                       bi->seq_number = dev->seq_number;
-                       dev->n_erased_blocks--;
-                       T(YAFFS_TRACE_ALLOCATE,
-                         (TSTR("Allocated block %d, seq  %d, %d left" TENDSTR),
-                          dev->alloc_block_finder, dev->seq_number,
-                          dev->n_erased_blocks));
-                       return dev->alloc_block_finder;
-               }
-       }
-
-       T(YAFFS_TRACE_ALWAYS,
-         (TSTR
-          ("yaffs tragedy: no more erased blocks, but there should have been %d"
-           TENDSTR), dev->n_erased_blocks));
-
-       return -1;
-}
-
-
-/*
- * Check if there's space to allocate...
- * Thinks.... do we need top make this ths same as yaffs_get_free_chunks()?
- */
-int yaffs_check_alloc_available(yaffs_dev_t *dev, int n_chunks)
-{
-       int reservedChunks;
-       int reservedBlocks = dev->param.n_reserved_blocks;
-       int checkpointBlocks;
-
-       checkpointBlocks = yaffs_calc_checkpt_blocks_required(dev);
-
-       reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->param.chunks_per_block);
-
-       return (dev->n_free_chunks > (reservedChunks + n_chunks));
-}
-
-static int yaffs_alloc_chunk(yaffs_dev_t *dev, int useReserve,
-               yaffs_block_info_t **blockUsedPtr)
-{
-       int retVal;
-       yaffs_block_info_t *bi;
-
-       if (dev->alloc_block < 0) {
-               /* Get next block to allocate off */
-               dev->alloc_block = yaffs_find_alloc_block(dev);
-               dev->alloc_page = 0;
-       }
-
-       if (!useReserve && !yaffs_check_alloc_available(dev, 1)) {
-               /* Not enough space to allocate unless we're allowed to use the reserve. */
-               return -1;
-       }
-
-       if (dev->n_erased_blocks < dev->param.n_reserved_blocks
-                       && dev->alloc_page == 0) {
-               T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
-       }
-
-       /* Next page please.... */
-       if (dev->alloc_block >= 0) {
-               bi = yaffs_get_block_info(dev, dev->alloc_block);
-
-               retVal = (dev->alloc_block * dev->param.chunks_per_block) +
-                       dev->alloc_page;
-               bi->pages_in_use++;
-               yaffs_set_chunk_bit(dev, dev->alloc_block,
-                               dev->alloc_page);
-
-               dev->alloc_page++;
-
-               dev->n_free_chunks--;
-
-               /* If the block is full set the state to full */
-               if (dev->alloc_page >= dev->param.chunks_per_block) {
-                       bi->block_state = YAFFS_BLOCK_STATE_FULL;
-                       dev->alloc_block = -1;
+       if (!bi->needs_retiring) {
+               yaffs2_checkpt_invalidate(dev);
+               erased_ok = yaffs_erase_block(dev, block_no);
+               if (!erased_ok) {
+                       dev->n_erase_failures++;
+                       yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+                         "**>> Erasure failed %d", block_no);
                }
+       }
 
-               if (blockUsedPtr)
-                       *blockUsedPtr = bi;
+       /* Verify erasure if needed */
+       if (erased_ok &&
+           ((yaffs_trace_mask & YAFFS_TRACE_ERASE) ||
+            !yaffs_skip_verification(dev))) {
+               for (i = 0; i < dev->param.chunks_per_block; i++) {
+                       if (!yaffs_check_chunk_erased(dev,
+                               block_no * dev->param.chunks_per_block + i)) {
+                               yaffs_trace(YAFFS_TRACE_ERROR,
+                                       ">>Block %d erasure supposedly OK, but chunk %d not erased",
+                                       block_no, i);
+                       }
+               }
+       }
 
-               return retVal;
+       if (!erased_ok) {
+               /* We lost a block of free space */
+               dev->n_free_chunks -= dev->param.chunks_per_block;
+               yaffs_retire_block(dev, block_no);
+               yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+                       "**>> Block %d retired", block_no);
+               return;
        }
 
-       T(YAFFS_TRACE_ERROR,
-                       (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
+       /* Clean it up... */
+       bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
+       bi->seq_number = 0;
+       dev->n_erased_blocks++;
+       bi->pages_in_use = 0;
+       bi->soft_del_pages = 0;
+       bi->has_shrink_hdr = 0;
+       bi->skip_erased_check = 1;      /* Clean, so no need to check */
+       bi->gc_prioritise = 0;
+       bi->has_summary = 0;
 
-       return -1;
+       yaffs_clear_chunk_bits(dev, block_no);
+
+       yaffs_trace(YAFFS_TRACE_ERASE, "Erased block %d", block_no);
 }
 
-static int yaffs_get_erased_chunks(yaffs_dev_t *dev)
+static inline int yaffs_gc_process_chunk(struct yaffs_dev *dev,
+                                       struct yaffs_block_info *bi,
+                                       int old_chunk, u8 *buffer)
 {
-       int n;
+       int new_chunk;
+       int mark_flash = 1;
+       struct yaffs_ext_tags tags;
+       struct yaffs_obj *object;
+       int matching_chunk;
+       int ret_val = YAFFS_OK;
 
-       n = dev->n_erased_blocks * dev->param.chunks_per_block;
+       memset(&tags, 0, sizeof(tags));
+       yaffs_rd_chunk_tags_nand(dev, old_chunk,
+                                buffer, &tags);
+       object = yaffs_find_by_number(dev, tags.obj_id);
 
-       if (dev->alloc_block > 0)
-               n += (dev->param.chunks_per_block - dev->alloc_page);
+       yaffs_trace(YAFFS_TRACE_GC_DETAIL,
+               "Collecting chunk in block %d, %d %d %d ",
+               dev->gc_chunk, tags.obj_id,
+               tags.chunk_id, tags.n_bytes);
 
-       return n;
+       if (object && !yaffs_skip_verification(dev)) {
+               if (tags.chunk_id == 0)
+                       matching_chunk =
+                           object->hdr_chunk;
+               else if (object->soft_del)
+                       /* Defeat the test */
+                       matching_chunk = old_chunk;
+               else
+                       matching_chunk =
+                           yaffs_find_chunk_in_file
+                           (object, tags.chunk_id,
+                            NULL);
+
+               if (old_chunk != matching_chunk)
+                       yaffs_trace(YAFFS_TRACE_ERROR,
+                               "gc: page in gc mismatch: %d %d %d %d",
+                               old_chunk,
+                               matching_chunk,
+                               tags.obj_id,
+                               tags.chunk_id);
+       }
+
+       if (!object) {
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "page %d in gc has no object: %d %d %d ",
+                       old_chunk,
+                       tags.obj_id, tags.chunk_id,
+                       tags.n_bytes);
+       }
+
+       if (object &&
+           object->deleted &&
+           object->soft_del && tags.chunk_id != 0) {
+               /* Data chunk in a soft deleted file,
+                * throw it away.
+                * It's a soft deleted data chunk,
+                * No need to copy this, just forget
+                * about it and fix up the object.
+                */
 
-}
+               /* Free chunks already includes
+                * softdeleted chunks, how ever this
+                * chunk is going to soon be really
+                * deleted which will increment free
+                * chunks. We have to decrement free
+                * chunks so this works out properly.
+                */
+               dev->n_free_chunks--;
+               bi->soft_del_pages--;
 
-/*
- * yaffs_skip_rest_of_block() skips over the rest of the allocation block
- * if we don't want to write to it.
- */
-void yaffs_skip_rest_of_block(yaffs_dev_t *dev)
-{
-       if(dev->alloc_block > 0){
-               yaffs_block_info_t *bi = yaffs_get_block_info(dev, dev->alloc_block);
-               if(bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING){
-                       bi->block_state = YAFFS_BLOCK_STATE_FULL;
-                       dev->alloc_block = -1;
+               object->n_data_chunks--;
+               if (object->n_data_chunks <= 0) {
+                       /* remeber to clean up obj */
+                       dev->gc_cleanup_list[dev->n_clean_ups] = tags.obj_id;
+                       dev->n_clean_ups++;
                }
-       }
-}
-
-
-static int yaffs_gc_block(yaffs_dev_t *dev, int block,
-               int wholeBlock)
-{
-       int oldChunk;
-       int newChunk;
-       int mark_flash;
-       int retVal = YAFFS_OK;
-       int i;
-       int isCheckpointBlock;
-       int matchingChunk;
-       int maxCopies;
+               mark_flash = 0;
+       } else if (object) {
+               /* It's either a data chunk in a live
+                * file or an ObjectHeader, so we're
+                * interested in it.
+                * NB Need to keep the ObjectHeaders of
+                * deleted files until the whole file
+                * has been deleted off
+                */
+               tags.serial_number++;
+               dev->n_gc_copies++;
+
+               if (tags.chunk_id == 0) {
+                       /* It is an object Id,
+                        * We need to nuke the
+                        * shrinkheader flags since its
+                        * work is done.
+                        * Also need to clean up
+                        * shadowing.
+                        */
+                       struct yaffs_obj_hdr *oh;
+                       oh = (struct yaffs_obj_hdr *) buffer;
+
+                       oh->is_shrink = 0;
+                       tags.extra_is_shrink = 0;
+                       oh->shadows_obj = 0;
+                       oh->inband_shadowed_obj_id = 0;
+                       tags.extra_shadows = 0;
+
+                       /* Update file size */
+                       if (object->variant_type == YAFFS_OBJECT_TYPE_FILE) {
+                               yaffs_oh_size_load(oh,
+                                   object->variant.file_variant.file_size);
+                               tags.extra_file_size =
+                                   object->variant.file_variant.file_size;
+                       }
 
-       int chunksBefore = yaffs_get_erased_chunks(dev);
-       int chunksAfter;
+                       yaffs_verify_oh(object, oh, &tags, 1);
+                       new_chunk =
+                           yaffs_write_new_chunk(dev, (u8 *) oh, &tags, 1);
+               } else {
+                       new_chunk =
+                           yaffs_write_new_chunk(dev, buffer, &tags, 1);
+               }
 
-       yaffs_ext_tags tags;
+               if (new_chunk < 0) {
+                       ret_val = YAFFS_FAIL;
+               } else {
 
-       yaffs_block_info_t *bi = yaffs_get_block_info(dev, block);
+                       /* Now fix up the Tnodes etc. */
 
-       yaffs_obj_t *object;
+                       if (tags.chunk_id == 0) {
+                               /* It's a header */
+                               object->hdr_chunk = new_chunk;
+                               object->serial = tags.serial_number;
+                       } else {
+                               /* It's a data chunk */
+                               yaffs_put_chunk_in_file(object, tags.chunk_id,
+                                                       new_chunk, 0);
+                       }
+               }
+       }
+       if (ret_val == YAFFS_OK)
+               yaffs_chunk_del(dev, old_chunk, mark_flash, __LINE__);
+       return ret_val;
+}
 
-       isCheckpointBlock = (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT);
+static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block)
+{
+       int old_chunk;
+       int ret_val = YAFFS_OK;
+       int i;
+       int is_checkpt_block;
+       int max_copies;
+       int chunks_before = yaffs_get_erased_chunks(dev);
+       int chunks_after;
+       struct yaffs_block_info *bi = yaffs_get_block_info(dev, block);
 
+       is_checkpt_block = (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT);
 
-       T(YAFFS_TRACE_TRACING,
-                       (TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
-                        block,
-                        bi->pages_in_use,
-                        bi->has_shrink_hdr,
-                        wholeBlock));
+       yaffs_trace(YAFFS_TRACE_TRACING,
+               "Collecting block %d, in use %d, shrink %d, whole_block %d",
+               block, bi->pages_in_use, bi->has_shrink_hdr,
+               whole_block);
 
        /*yaffs_verify_free_chunks(dev); */
 
-       if(bi->block_state == YAFFS_BLOCK_STATE_FULL)
+       if (bi->block_state == YAFFS_BLOCK_STATE_FULL)
                bi->block_state = YAFFS_BLOCK_STATE_COLLECTING;
-       
+
        bi->has_shrink_hdr = 0; /* clear the flag so that the block can erase */
 
        dev->gc_disable = 1;
 
-       if (isCheckpointBlock ||
-                       !yaffs_still_some_chunks(dev, block)) {
-               T(YAFFS_TRACE_TRACING,
-                               (TSTR
-                                ("Collecting block %d that has no chunks in use" TENDSTR),
-                                block));
+       yaffs_summary_gc(dev, block);
+
+       if (is_checkpt_block || !yaffs_still_some_chunks(dev, block)) {
+               yaffs_trace(YAFFS_TRACE_TRACING,
+                       "Collecting block %d that has no chunks in use",
+                       block);
                yaffs_block_became_dirty(dev, block);
        } else {
 
-               __u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
+               u8 *buffer = yaffs_get_temp_buffer(dev);
 
                yaffs_verify_blk(dev, bi, block);
 
-               maxCopies = (wholeBlock) ? dev->param.chunks_per_block : 5;
-               oldChunk = block * dev->param.chunks_per_block + dev->gc_chunk;
+               max_copies = (whole_block) ? dev->param.chunks_per_block : 5;
+               old_chunk = block * dev->param.chunks_per_block + dev->gc_chunk;
 
-               for (/* init already done */;
-                    retVal == YAFFS_OK &&
+               for (/* init already done */ ;
+                    ret_val == YAFFS_OK &&
                     dev->gc_chunk < dev->param.chunks_per_block &&
                     (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) &&
-                    maxCopies > 0;
-                    dev->gc_chunk++, oldChunk++) {
+                    max_copies > 0;
+                    dev->gc_chunk++, old_chunk++) {
                        if (yaffs_check_chunk_bit(dev, block, dev->gc_chunk)) {
-
-                               /* This page is in use and might need to be copied off */
-
-                               maxCopies--;
-
-                               mark_flash = 1;
-
-                               yaffs_init_tags(&tags);
-
-                               yaffs_rd_chunk_tags_nand(dev, oldChunk,
-                                                               buffer, &tags);
-
-                               object =
-                                   yaffs_find_by_number(dev,
-                                                            tags.obj_id);
-
-                               T(YAFFS_TRACE_GC_DETAIL,
-                                 (TSTR
-                                  ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-                                  dev->gc_chunk, tags.obj_id, tags.chunk_id,
-                                  tags.n_bytes));
-
-                               if (object && !yaffs_skip_verification(dev)) {
-                                       if (tags.chunk_id == 0)
-                                               matchingChunk = object->hdr_chunk;
-                                       else if (object->soft_del)
-                                               matchingChunk = oldChunk; /* Defeat the test */
-                                       else
-                                               matchingChunk = yaffs_find_chunk_in_file(object, tags.chunk_id, NULL);
-
-                                       if (oldChunk != matchingChunk)
-                                               T(YAFFS_TRACE_ERROR,
-                                                 (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
-                                                 oldChunk, matchingChunk, tags.obj_id, tags.chunk_id));
-
-                               }
-
-                               if (!object) {
-                                       T(YAFFS_TRACE_ERROR,
-                                         (TSTR
-                                          ("page %d in gc has no object: %d %d %d "
-                                           TENDSTR), oldChunk,
-                                           tags.obj_id, tags.chunk_id, tags.n_bytes));
-                               }
-
-                               if (object &&
-                                   object->deleted &&
-                                   object->soft_del &&
-                                   tags.chunk_id != 0) {
-                                       /* Data chunk in a soft deleted file, throw it away
-                                        * It's a soft deleted data chunk,
-                                        * No need to copy this, just forget about it and
-                                        * fix up the object.
-                                        */
-                                        
-                                       /* Free chunks already includes softdeleted chunks.
-                                        * How ever this chunk is going to soon be really deleted
-                                        * which will increment free chunks.
-                                        * We have to decrement free chunks so this works out properly.
-                                        */
-                                       dev->n_free_chunks--;
-                                       bi->soft_del_pages--;
-
-                                       object->n_data_chunks--;
-
-                                       if (object->n_data_chunks <= 0) {
-                                               /* remeber to clean up the object */
-                                               dev->gc_cleanup_list[dev->n_clean_ups] =
-                                                   tags.obj_id;
-                                               dev->n_clean_ups++;
-                                       }
-                                       mark_flash = 0;
-                               } else if (0) {
-                                       /* Todo object && object->deleted && object->n_data_chunks == 0 */
-                                       /* Deleted object header with no data chunks.
-                                        * Can be discarded and the file deleted.
-                                        */
-                                       object->hdr_chunk = 0;
-                                       yaffs_free_tnode(object->my_dev,
-                                                       object->variant.
-                                                       file_variant.top);
-                                       object->variant.file_variant.top = NULL;
-                                       yaffs_generic_obj_del(object);
-
-                               } else if (object) {
-                                       /* It's either a data chunk in a live file or
-                                        * an ObjectHeader, so we're interested in it.
-                                        * NB Need to keep the ObjectHeaders of deleted files
-                                        * until the whole file has been deleted off
-                                        */
-                                       tags.serial_number++;
-
-                                       dev->n_gc_copies++;
-
-                                       if (tags.chunk_id == 0) {
-                                               /* It is an object Id,
-                                                * We need to nuke the shrinkheader flags first
-                                                * Also need to clean up shadowing.
-                                                * We no longer want the shrinkHeader flag since its work is done
-                                                * and if it is left in place it will mess up scanning.
-                                                */
-
-                                               yaffs_obj_header *oh;
-                                               oh = (yaffs_obj_header *)buffer;
-
-                                               oh->is_shrink = 0;
-                                               tags.extra_is_shrink = 0;
-
-                                               oh->shadows_obj = 0;
-                                               oh->inband_shadowed_obj_id = 0;
-                                               tags.extra_shadows = 0;
-
-                                               /* Update file size */
-                                               if(object->variant_type == YAFFS_OBJECT_TYPE_FILE){
-                                                       oh->file_size = object->variant.file_variant.file_size;
-                                                       tags.extra_length = oh->file_size;
-                                               }
-
-                                               yaffs_verify_oh(object, oh, &tags, 1);
-                                               newChunk =
-                                                   yaffs_write_new_chunk(dev,(__u8 *) oh, &tags, 1);
-                                       } else
-                                               newChunk =
-                                                   yaffs_write_new_chunk(dev, buffer, &tags, 1);
-
-                                       if (newChunk < 0) {
-                                               retVal = YAFFS_FAIL;
-                                       } else {
-
-                                               /* Ok, now fix up the Tnodes etc. */
-
-                                               if (tags.chunk_id == 0) {
-                                                       /* It's a header */
-                                                       object->hdr_chunk =  newChunk;
-                                                       object->serial =   tags.serial_number;
-                                               } else {
-                                                       /* It's a data chunk */
-                                                       int ok;
-                                                       ok = yaffs_put_chunk_in_file
-                                                           (object,
-                                                            tags.chunk_id,
-                                                            newChunk, 0);
-                                               }
-                                       }
-                               }
-
-                               if (retVal == YAFFS_OK)
-                                       yaffs_chunk_del(dev, oldChunk, mark_flash, __LINE__);
-
+                               /* Page is in use and might need to be copied */
+                               max_copies--;
+                               ret_val = yaffs_gc_process_chunk(dev, bi,
+                                                       old_chunk, buffer);
                        }
                }
-
-               yaffs_release_temp_buffer(dev, buffer, __LINE__);
-
-
-
+               yaffs_release_temp_buffer(dev, buffer);
        }
 
        yaffs_verify_collected_blk(dev, bi, block);
 
-
-
        if (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) {
                /*
                 * The gc did not complete. Set block state back to FULL
@@ -2332,32 +2598,25 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block,
                /* Do any required cleanups */
                for (i = 0; i < dev->n_clean_ups; i++) {
                        /* Time to delete the file too */
-                       object =
-                           yaffs_find_by_number(dev,
-                                                    dev->gc_cleanup_list[i]);
+                       struct yaffs_obj *object =
+                           yaffs_find_by_number(dev, dev->gc_cleanup_list[i]);
                        if (object) {
                                yaffs_free_tnode(dev,
-                                               object->variant.file_variant.
-                                               top);
+                                         object->variant.file_variant.top);
                                object->variant.file_variant.top = NULL;
-                               T(YAFFS_TRACE_GC,
-                                 (TSTR
-                                  ("yaffs: About to finally delete object %d"
-                                   TENDSTR), object->obj_id));
+                               yaffs_trace(YAFFS_TRACE_GC,
+                                       "yaffs: About to finally delete object %d",
+                                       object->obj_id);
                                yaffs_generic_obj_del(object);
                                object->my_dev->n_deleted_files--;
                        }
 
                }
-
-
-               chunksAfter = yaffs_get_erased_chunks(dev);
-               if (chunksBefore >= chunksAfter) {
-                       T(YAFFS_TRACE_GC,
-                         (TSTR
-                          ("gc did not increase free chunks before %d after %d"
-                           TENDSTR), chunksBefore, chunksAfter));
-               }
+               chunks_after = yaffs_get_erased_chunks(dev);
+               if (chunks_before >= chunks_after)
+                       yaffs_trace(YAFFS_TRACE_GC,
+                               "gc did not increase free chunks before %d after %d",
+                               chunks_before, chunks_after);
                dev->gc_block = 0;
                dev->gc_chunk = 0;
                dev->n_clean_ups = 0;
@@ -2365,24 +2624,23 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block,
 
        dev->gc_disable = 0;
 
-       return retVal;
+       return ret_val;
 }
 
 /*
- * FindBlockForgarbageCollection is used to select the dirtiest block (or close enough)
+ * find_gc_block() selects the dirtiest block (or close enough)
  * for garbage collection.
  */
 
-static unsigned yaffs_find_gc_block(yaffs_dev_t *dev,
-                                       int aggressive,
-                                       int background)
+static unsigned yaffs_find_gc_block(struct yaffs_dev *dev,
+                                   int aggressive, int background)
 {
        int i;
        int iterations;
        unsigned selected = 0;
        int prioritised = 0;
-       int prioritisedExists = 0;
-       yaffs_block_info_t *bi;
+       int prioritised_exist = 0;
+       struct yaffs_block_info *bi;
        int threshold;
 
        /* First let's see if we need to grab a prioritised block */
@@ -2390,13 +2648,12 @@ static unsigned yaffs_find_gc_block(yaffs_dev_t *dev,
                dev->gc_dirtiest = 0;
                bi = dev->block_info;
                for (i = dev->internal_start_block;
-                       i <= dev->internal_end_block && !selected;
-                       i++) {
+                    i <= dev->internal_end_block && !selected; i++) {
 
                        if (bi->gc_prioritise) {
-                               prioritisedExists = 1;
+                               prioritised_exist = 1;
                                if (bi->block_state == YAFFS_BLOCK_STATE_FULL &&
-                                  yaffs_block_ok_for_gc(dev, bi)) {
+                                   yaffs_block_ok_for_gc(dev, bi)) {
                                        selected = i;
                                        prioritised = 1;
                                }
@@ -2406,124 +2663,125 @@ static unsigned yaffs_find_gc_block(yaffs_dev_t *dev,
 
                /*
                 * If there is a prioritised block and none was selected then
-                * this happened because there is at least one old dirty block gumming
-                * up the works. Let's gc the oldest dirty block.
+                * this happened because there is at least one old dirty block
+                * gumming up the works. Let's gc the oldest dirty block.
                 */
 
-               if(prioritisedExists &&
-                       !selected &&
-                       dev->oldest_dirty_block > 0)
+               if (prioritised_exist &&
+                   !selected && dev->oldest_dirty_block > 0)
                        selected = dev->oldest_dirty_block;
 
-               if (!prioritisedExists) /* None found, so we can clear this */
+               if (!prioritised_exist) /* None found, so we can clear this */
                        dev->has_pending_prioritised_gc = 0;
        }
 
-       /* If we're doing aggressive GC then we are happy to take a less-dirty block, and
-        * search harder.
-        * else (we're doing a leasurely gc), then we only bother to do this if the
+       /* If we're doing aggressive GC then we are happy to take a less-dirty
+        * block, and search harder.
+        * else (leasurely gc), then we only bother to do this if the
         * block has only a few pages in use.
         */
 
-       if (!selected){
-               int pagesUsed;
-               int nBlocks = dev->internal_end_block - dev->internal_start_block + 1;
-               if (aggressive){
+       if (!selected) {
+               int pages_used;
+               int n_blocks =
+                   dev->internal_end_block - dev->internal_start_block + 1;
+               if (aggressive) {
                        threshold = dev->param.chunks_per_block;
-                       iterations = nBlocks;
+                       iterations = n_blocks;
                } else {
-                       int maxThreshold;
+                       int max_threshold;
 
-                       if(background)
-                               maxThreshold = dev->param.chunks_per_block/2;
+                       if (background)
+                               max_threshold = dev->param.chunks_per_block / 2;
                        else
-                               maxThreshold = dev->param.chunks_per_block/8;
+                               max_threshold = dev->param.chunks_per_block / 8;
 
-                       if(maxThreshold <  YAFFS_GC_PASSIVE_THRESHOLD)
-                               maxThreshold = YAFFS_GC_PASSIVE_THRESHOLD;
+                       if (max_threshold < YAFFS_GC_PASSIVE_THRESHOLD)
+                               max_threshold = YAFFS_GC_PASSIVE_THRESHOLD;
 
-                       threshold = background ?
-                               (dev->gc_not_done + 2) * 2 : 0;
-                       if(threshold <YAFFS_GC_PASSIVE_THRESHOLD)
+                       threshold = background ? (dev->gc_not_done + 2) * 2 : 0;
+                       if (threshold < YAFFS_GC_PASSIVE_THRESHOLD)
                                threshold = YAFFS_GC_PASSIVE_THRESHOLD;
-                       if(threshold > maxThreshold)
-                               threshold = maxThreshold;
+                       if (threshold > max_threshold)
+                               threshold = max_threshold;
 
-                       iterations = nBlocks / 16 + 1;
+                       iterations = n_blocks / 16 + 1;
                        if (iterations > 100)
                                iterations = 100;
                }
 
                for (i = 0;
-                       i < iterations &&
-                       (dev->gc_dirtiest < 1 ||
-                               dev->gc_pages_in_use > YAFFS_GC_GOOD_ENOUGH);
-                       i++) {
+                    i < iterations &&
+                    (dev->gc_dirtiest < 1 ||
+                     dev->gc_pages_in_use > YAFFS_GC_GOOD_ENOUGH);