Change enums to u32 for stored fields
[yaffs2.git] / yaffs_guts.c
index eea828a..4e679bf 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"
 
 #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 erased_ok);
-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 use_reserver);
-
-
-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 chunk_obj);
-
-static int yaffs_alloc_chunk(yaffs_dev_t *dev, int use_reserver,
-                               yaffs_block_info_t **block_ptr);
-
-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 *oh_name, int buff_size);
-static void yaffs_load_oh_from_name(yaffs_dev_t *dev,YCHAR *oh_name, 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 *chunk_out,
-               __u32 *offset_out)
+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 */
 
@@ -121,8 +64,8 @@ static void yaffs_addr_to_chunk(yaffs_dev_t *dev, loff_t addr, int *chunk_out,
 
                chunk /= dev->chunk_div;
 
-               chunk_base = ((loff_t)chunk) * dev->data_bytes_per_chunk;
-               offset = (__u32)(addr - chunk_base);
+               chunk_base = ((loff_t) chunk) * dev->data_bytes_per_chunk;
+               offset = (u32) (addr - chunk_base);
        }
 
        *chunk_out = chunk;
@@ -135,7 +78,7 @@ static void yaffs_addr_to_chunk(yaffs_dev_t *dev, loff_t addr, int *chunk_out,
  * be hellishly efficient.
  */
 
-static __u32 calc_shifts_ceiling(__u32 x)
+static inline u32 calc_shifts_ceiling(u32 x)
 {
        int extra_bits;
        int shifts;
@@ -158,16 +101,16 @@ static __u32 calc_shifts_ceiling(__u32 x)
 /* Function to return the number of shifts to get a 1 in bit 0
  */
 
-static __u32 calc_shifts(__u32 x)
+static inline u32 calc_shifts(u32 x)
 {
-       __u32 shifts;
+       u32 shifts;
 
-       shifts =  0;
+       shifts = 0;
 
        if (!x)
                return 0;
 
-       while (!(x&1)) {
+       while (!(x & 1)) {
                x >>= 1;
                shifts++;
        }
@@ -175,70 +118,53 @@ static __u32 calc_shifts(__u32 x)
        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,45 +305,187 @@ 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 temp_tags;
-       __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,&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)
+
+       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 use_reserver)
+
+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 write_ok = 0;
@@ -395,7 +494,7 @@ static int yaffs_write_new_chunk(struct yaffs_dev_s *dev,
        yaffs2_checkpt_invalidate(dev);
 
        do {
-               yaffs_block_info_t *bi = 0;
+               struct yaffs_block_info *bi = 0;
                int erased_ok = 0;
 
                chunk = yaffs_alloc_chunk(dev, use_reserver, &bi);
@@ -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,37 +523,37 @@ 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) {
                        erased_ok = yaffs_check_chunk_erased(dev, chunk);
                        if (erased_ok != YAFFS_OK) {
-                               T(YAFFS_TRACE_ERROR,
-                               (TSTR("**>> yaffs chunk %d was not erased"
-                               TENDSTR), chunk));
+                               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;
                        }
                }
 
-               write_ok = 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)
-                       write_ok = yaffs_verify_chunk_written(dev, chunk, data, tags);
+               if (!bi->skip_erased_check)
+                       write_ok =
+                           yaffs_verify_chunk_written(dev, chunk, data, tags);
 
                if (write_ok != YAFFS_OK) {
                        /* Clean up aborted write, skip to next block and
@@ -469,57 +568,57 @@ static int yaffs_write_new_chunk(struct yaffs_dev_s *dev,
                yaffs_handle_chunk_wr_ok(dev, chunk, data, tags);
 
        } while (write_ok != YAFFS_OK &&
-               (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
+                (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
 
        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,112 +629,138 @@ static void yaffs_retire_block(yaffs_dev_t *dev, int flash_block)
        dev->n_retired_blocks++;
 }
 
-/*
- * Functions for robustisizing TODO
- *
- */
+/*---------------- Name handling functions ------------*/
 
-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_load_name_from_oh(struct yaffs_dev *dev, YCHAR *name,
+                                   const YCHAR *oh_name, int buff_size)
 {
-       dev=dev;
-       nand_chunk=nand_chunk;
-       data=data;
-       tags=tags;
+#ifdef CONFIG_YAFFS_AUTO_UNICODE
+       if (dev->param.auto_unicode) {
+               if (*oh_name) {
+                       /* It is an ASCII name, do an ASCII to
+                        * unicode conversion */
+                       const char *ascii_oh_name = (const char *)oh_name;
+                       int n = buff_size - 1;
+                       while (n > 0 && *ascii_oh_name) {
+                               *name = *ascii_oh_name;
+                               name++;
+                               ascii_oh_name++;
+                               n--;
+                       }
+               } else {
+                       strncpy(name, oh_name + 1, buff_size - 1);
+               }
+       } else {
+#else
+       (void) dev;
+       {
+#endif
+               strncpy(name, oh_name, buff_size - 1);
+       }
 }
 
-static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk,
-                               const yaffs_ext_tags *tags)
+static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name,
+                                   const YCHAR *name)
 {
-       dev=dev;
-       nand_chunk=nand_chunk;
-       tags=tags;
-}
+#ifdef CONFIG_YAFFS_AUTO_UNICODE
 
-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++;
+       int is_ascii;
+       const YCHAR *w;
 
-               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)));
+       if (dev->param.auto_unicode) {
+
+               is_ascii = 1;
+               w = name;
+
+               /* Figure out if the name will fit in ascii character set */
+               while (is_ascii && *w) {
+                       if ((*w) & 0xff00)
+                               is_ascii = 0;
+                       w++;
+               }
 
+               if (is_ascii) {
+                       /* It is an ASCII name, so convert unicode to ascii */
+                       char *ascii_oh_name = (char *)oh_name;
+                       int n = YAFFS_MAX_NAME_LENGTH - 1;
+                       while (n > 0 && *name) {
+                               *ascii_oh_name = *name;
+                               name++;
+                               ascii_oh_name++;
+                               n--;
+                       }
+               } else {
+                       /* Unicode name, so save starting at the second YCHAR */
+                       *oh_name = 0;
+                       strncpy(oh_name + 1, name, YAFFS_MAX_NAME_LENGTH - 2);
                }
+       } else {
+#else
+       dev = dev;
+       {
+#endif
+               strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1);
        }
 }
 
-static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk,
-               int erased_ok)
+static u16 yaffs_calc_name_sum(const YCHAR *name)
 {
-       int flash_block = nand_chunk / dev->param.chunks_per_block;
-       yaffs_block_info_t *bi = yaffs_get_block_info(dev, flash_block);
+       u16 sum = 0;
+       u16 i = 1;
 
-       yaffs_handle_chunk_error(dev, bi);
+       if (!name)
+               return 0;
 
-       if (erased_ok) {
-               /* 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));
-       }
+       while ((*name) && i < (YAFFS_MAX_NAME_LENGTH / 2)) {
 
-       /* Delete the chunk */
-       yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
-       yaffs_skip_rest_of_block(dev);
+               /* 0x1f mask is case insensitive */
+               sum += ((*name) & 0x1f) * i;
+               i++;
+               name++;
+       }
+       return sum;
 }
 
 
-/*---------------- Name handling functions ------------*/
-
-static __u16 yaffs_calc_name_sum(const YCHAR *name)
+void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name)
 {
-       __u16 sum = 0;
-       __u16 i = 1;
+       memset(obj->short_name, 0, sizeof(obj->short_name));
 
-       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;
-#else
-                       sum += (*bname) * i;
-#endif
-                       i++;
-                       bname++;
-               }
+       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);
        }
-       return sum;
-}
 
-void yaffs_set_obj_name(yaffs_obj_t *obj, const YCHAR *name)
-{
-#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);
-       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)
+void yaffs_set_obj_name_from_oh(struct yaffs_obj *obj,
+                               const struct yaffs_obj_hdr *oh)
 {
 #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);
+       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
-       yaffs_set_obj_name(obj,oh->name);
+       yaffs_set_obj_name(obj, oh->name);
 #endif
 }
 
+loff_t yaffs_max_file_size(struct yaffs_dev *dev)
+{
+       if(sizeof(loff_t) < 8)
+               return YAFFS_MAX_FILE_SIZE_32;
+       else
+               return ((loff_t) YAFFS_MAX_CHUNK_ID) * dev->data_bytes_per_chunk;
+}
+
 /*-------------------- TNODES -------------------
 
  * List of spare tnodes
@@ -643,44 +768,43 @@ 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 bit_in_map;
-       __u32 bit_in_word;
-       __u32 word_in_map;
-       __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;
@@ -696,21 +820,22 @@ void yaffs_load_tnode_0(yaffs_dev_t *dev, yaffs_tnode_t *tn, unsigned pos,
 
        if (dev->tnode_width > (32 - bit_in_word)) {
                bit_in_word = (32 - bit_in_word);
-               word_in_map++;;
-               mask = dev->tnode_mask >> (/*dev->tnode_width -*/ 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 bit_in_map;
-       __u32 bit_in_word;
-       __u32 word_in_map;
-       __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;
 
@@ -720,9 +845,9 @@ __u32 yaffs_get_group_base(yaffs_dev_t *dev, yaffs_tnode_t *tn,
 
        val = map[word_in_map] >> bit_in_word;
 
-       if      (dev->tnode_width > (32 - bit_in_word)) {
+       if (dev->tnode_width > (32 - bit_in_word)) {
                bit_in_word = (32 - bit_in_word);
-               word_in_map++;;
+               word_in_map++;
                val |= (map[word_in_map] << bit_in_word);
        }
 
@@ -740,16 +865,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;
+       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)
@@ -768,47 +893,47 @@ yaffs_tnode_t *yaffs_find_tnode_0(yaffs_dev_t *dev,
        }
 
        if (required_depth > file_struct->top_level)
-               return NULL; /* Not tall enough, so we can't find it */
+               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 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)
@@ -823,7 +948,6 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev,
                required_depth++;
        }
 
-
        if (required_depth > file_struct->top_level) {
                /* Not tall enough, gotta make the tree taller */
                for (i = file_struct->top_level; i < required_depth; i++) {
@@ -835,8 +959,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 +978,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 +1006,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,22 +1015,33 @@ 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 the_chunk,
-                               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; 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)
+               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, the_chunk, NULL,
-                                                               tags);
-                               if (yaffs_tags_match(tags, obj_id, inode_chunk)) {
+                                                        tags);
+                               if (yaffs_tags_match(tags,
+                                                       obj_id, inode_chunk)) {
                                        /* found it; */
                                        return the_chunk;
                                }
@@ -916,399 +1052,635 @@ static int yaffs_find_chunk_in_group(yaffs_dev_t *dev, int 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 the_chunk;
-       yaffs_ext_tags tags;
-       int found_chunk;
-       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 all_done = 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; all_done && i >= 0;
-                            i--) {
-                               if (tn->internal[i]) {
-                                       if (limit && (*limit) < 0) {
-                                               all_done = 0;
-                                       } else {
-                                               all_done =
-                                                       yaffs_del_worker(in,
-                                                               tn->
-                                                               internal
-                                                               [i],
-                                                               level -
-                                                               1,
-                                                               (chunk_offset
-                                                                       <<
-                                                                       YAFFS_TNODES_INTERNAL_BITS)
-                                                               + i,
-                                                               limit);
-                                       }
-                                       if (all_done) {
-                                               yaffs_free_tnode(dev,
-                                                               tn->
-                                                               internal[i]);
-                                               tn->internal[i] = NULL;
-                                       }
-                               }
-                       }
-                       return (all_done) ? 1 : 0;
-               } else if (level == 0) {
-                       int hit_limit = 0;
-
-                       for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hit_limit;
-                                       i--) {
-                               the_chunk = yaffs_get_group_base(dev, tn, i);
-                               if (the_chunk) {
-
-                                       inode_chunk = (chunk_offset <<
-                                               YAFFS_TNODES_LEVEL0_BITS) + i;
-
-                                       found_chunk =
-                                               yaffs_find_chunk_in_group(dev,
-                                                               the_chunk,
-                                                               &tags,
-                                                               in->obj_id,
-                                                               inode_chunk);
-
-                                       if (found_chunk > 0) {
-                                               yaffs_chunk_del(dev,
-                                                                 found_chunk, 1,
-                                                                 __LINE__);
-                                               in->n_data_chunks--;
-                                               if (limit) {
-                                                       *limit = *limit - 1;
-                                                       if (*limit <= 0)
-                                                               hit_limit = 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);
 
-                       }
-                       return (i < 0) ? 1 : 0;
+       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;
        }
 
-       return 1;
+       tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
 
-}
+       if (!tn)
+               return ret_val;
 
-#endif
+       the_chunk = yaffs_get_group_base(dev, tn, inode_chunk);
 
-static void yaffs_soft_del_chunk(yaffs_dev_t *dev, int chunk)
-{
-       yaffs_block_info_t *the_block;
-       unsigned block_no;
+       ret_val = yaffs_find_chunk_in_group(dev, the_chunk, tags, in->obj_id,
+                                             inode_chunk);
 
-       T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
+       /* Delete the entry in the filestructure (if found) */
+       if (ret_val != -1)
+               yaffs_load_tnode_0(dev, tn, inode_chunk, 0);
 
-       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, the_block);
-       }
+       return ret_val;
 }
 
-/* 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)
+int yaffs_put_chunk_in_file(struct yaffs_obj *in, int inode_chunk,
+                           int nand_chunk, int in_scan)
 {
-       int i;
-       int the_chunk;
-       int all_done = 1;
-       yaffs_dev_t *dev = in->my_dev;
-
-       if (tn) {
-               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 {
-                                               /* Hoosterman... how could this happen? */
-                                       }
-                               }
-                       }
-                       return (all_done) ? 1 : 0;
-               } else if (level == 0) {
-
-                       for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
-                               the_chunk = yaffs_get_group_base(dev, tn, i);
-                               if (the_chunk) {
-                                       /* 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, the_chunk);
-                                       yaffs_load_tnode_0(dev, tn, i, 0);
-                               }
+       /* 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.
+        */
 
-                       }
-                       return 1;
+       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;
        }
 
-       return 1;
+       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;
 
-static void yaffs_soft_del_file(yaffs_obj_t *obj)
-{
-       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;
-               }
-       }
-}
+       existing_cunk = yaffs_get_group_base(dev, tn, inode_chunk);
 
-/* 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.
- */
+       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.
+                */
 
-static yaffs_tnode_t *yaffs_prune_worker(yaffs_dev_t *dev, yaffs_tnode_t *tn,
-                               __u32 level, int del0)
-{
-       int i;
-       int has_data;
+               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 (tn) {
-               has_data = 0;
+                       if (in_scan > 0) {
+                               /* Only do this for forward scanning */
+                               yaffs_rd_chunk_tags_nand(dev,
+                                                        nand_chunk,
+                                                        NULL, &new_tags);
 
-               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);
-                               }
+                               /* 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"
+                                       );
 
-                               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++;
-                        }
-                }
+                       /* NB The deleted flags should be false, otherwise
+                        * the chunks will not be loaded during a scan
+                        */
 
-               if (has_data == 0 && del0) {
-                       /* Free and return NULL */
+                       if (in_scan > 0) {
+                               new_serial = new_tags.serial_number;
+                               existing_serial = existing_tags.serial_number;
+                       }
 
-                       yaffs_free_tnode(dev, tn);
-                       tn = NULL;
+                       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 tn;
+       if (existing_cunk == 0)
+               in->n_data_chunks++;
+
+       yaffs_load_tnode_0(dev, tn, inode_chunk, nand_chunk);
 
+       return YAFFS_OK;
 }
 
-static int yaffs_prune_tree(yaffs_dev_t *dev,
-                               yaffs_file_s *file_struct)
+static void yaffs_soft_del_chunk(struct yaffs_dev *dev, int chunk)
 {
-       int i;
-       int has_data;
-       int done = 0;
-       yaffs_tnode_t *tn;
+       struct yaffs_block_info *the_block;
+       unsigned block_no;
 
-       if (file_struct->top_level > 0) {
-               file_struct->top =
-                   yaffs_prune_worker(dev, file_struct->top, file_struct->top_level, 0);
+       yaffs_trace(YAFFS_TRACE_DELETION, "soft delete chunk %d", chunk);
 
-               /* 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)
-                */
+       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, the_block);
+       }
+}
 
-               while (file_struct->top_level && !done) {
-                       tn = file_struct->top;
+/* 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.
+ */
 
-                       has_data = 0;
-                       for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
-                               if (tn->internal[i])
-                                       has_data++;
-                       }
+static int yaffs_soft_del_worker(struct yaffs_obj *in, struct yaffs_tnode *tn,
+                                u32 level, int chunk_offset)
+{
+       int i;
+       int the_chunk;
+       int all_done = 1;
+       struct yaffs_dev *dev = in->my_dev;
 
-                       if (!has_data) {
-                               file_struct->top = tn->internal[0];
-                               file_struct->top_level--;
-                               yaffs_free_tnode(dev, tn);
-                       } else {
-                               done = 1;
+       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 (all_done) ? 1 : 0;
        }
 
-       return YAFFS_OK;
+       /* 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;
 }
 
-/*-------------------- 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)
+static void yaffs_remove_obj_from_dir(struct yaffs_obj *obj)
 {
-       yaffs_obj_t *obj = yaffs_alloc_raw_obj(dev);
-
-       if (obj) {
-               dev->n_obj++;
-
-               /* Now sweeten it up... */
-
-               memset(obj, 0, sizeof(yaffs_obj_t));
-               obj->being_created = 1;
-
-               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);
-
+       struct yaffs_dev *dev = obj->my_dev;
+       struct yaffs_obj *parent;
 
-               /* 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);
-               }
+       yaffs_verify_obj_in_dir(obj);
+       parent = obj->parent;
 
-               /* 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);
+       yaffs_verify_dir(parent);
 
-               obj->being_created = 0;
-       }
+       if (dev && dev->param.remove_obj_fn)
+               dev->param.remove_obj_fn(obj);
 
-       dev->checkpoint_blocks_required = 0; /* force recalculation*/
+       list_del_init(&obj->siblings);
+       obj->parent = NULL;
 
-       return obj;
+       yaffs_verify_dir(parent);
 }
 
-static yaffs_obj_t *yaffs_create_fake_dir(yaffs_dev_t *dev, int number,
-                                              __u32 mode)
+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();
+       }
 
-       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 (obj->siblings.prev == NULL) {
+               /* Not initialised */
+               BUG();
        }
 
-       return obj;
+       yaffs_verify_dir(directory);
 
-}
+       yaffs_remove_obj_from_dir(obj);
 
-static void yaffs_unhash_obj(yaffs_obj_t *obj)
-{
-       int bucket;
-       yaffs_dev_t *dev = obj->my_dev;
+       /* Now add it */
+       list_add(&obj->siblings, &directory->variant.dir_variant.children);
+       obj->parent = directory;
 
-       /* 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);
-               bucket = yaffs_hash_fn(obj->obj_id);
-               dev->obj_bucket[bucket].count--;
+       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);
 }
 
-/*  FreeObject frees up a Object and puts it back on the free list */
-static void yaffs_free_obj(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)
 {
-       yaffs_dev_t *dev = obj->my_dev;
+       int unlink_op;
+       int del_op;
+       struct yaffs_obj *existing_target;
 
-       T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), obj, obj->my_inode));
+       if (new_dir == NULL)
+               new_dir = obj->parent;  /* use the old directory */
 
-       if (!obj)
-               YBUG();
-       if (obj->parent)
-               YBUG();
-       if (!ylist_empty(&obj->siblings))
-               YBUG();
+       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;
+}
+
+/*------------------------ 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.
+ *
+ *   There are a small number (~10) of cache chunks per device so that we don't
+ *   need a very intelligent search.
+ */
+
+static int yaffs_obj_cache_dirty(struct yaffs_obj *obj)
+{
+       struct yaffs_dev *dev = obj->my_dev;
+       int i;
+       struct yaffs_cache *cache;
+       int n_caches = obj->my_dev->param.n_caches;
+
+       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_single_cache(struct yaffs_cache *cache, int discard)
+{
+
+       if (!cache || cache->locked)
+               return;
+
+       /* Write it out and free it up  if need be.*/
+       if (cache->dirty) {
+               yaffs_wr_data_obj(cache->object,
+                                 cache->chunk_id,
+                                 cache->data,
+                                 cache->n_bytes,
+                                 1);
+
+               cache->dirty = 0;
+       }
+
+       if (discard)
+               cache->object = NULL;
+}
+
+static void yaffs_flush_file_cache(struct yaffs_obj *obj, int discard)
+{
+       struct yaffs_dev *dev = obj->my_dev;
+       int i;
+       struct yaffs_cache *cache;
+       int n_caches = obj->my_dev->param.n_caches;
+
+       if (n_caches < 1)
+               return;
+
+
+       /* Find the chunks for this object and flush them. */
+       for (i = 0; i < n_caches; i++) {
+               cache = &dev->cache[i];
+               if (cache->object == obj)
+                       yaffs_flush_single_cache(cache, discard);
+       }
+
+}
+
+
+void yaffs_flush_whole_cache(struct yaffs_dev *dev, int discard)
+{
+       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, discard);
+       } while (obj);
+
+}
+
+/* Grab us an unused 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 struct yaffs_cache *yaffs_grab_chunk_cache(struct yaffs_dev *dev)
+{
+       struct yaffs_cache *cache;
+       int usage;
+       int i;
+
+       if (dev->param.n_caches < 1)
+               return NULL;
+
+       /* First look for an unused cache */
+
+       cache = yaffs_grab_chunk_worker(dev);
+
+       if (cache)
+               return cache;
+
+       /*
+        * Thery were all in use.
+        * Find the LRU cache and flush it if it is dirty.
+        */
+
+       usage = -1;
+       cache = NULL;
+
+       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;
+                               cache = &dev->cache[i];
+               }
+       }
+
+#if 1
+       yaffs_flush_single_cache(cache, 1);
+#else
+       yaffs_flush_file_cache(cache->object, 1);
+       cache = yaffs_grab_chunk_worker(dev);
+#endif
+
+       return cache;
+}
+
+/* Find a cached chunk */
+static struct yaffs_cache *yaffs_find_chunk_cache(const struct yaffs_obj *obj,
+                                                 int chunk_id)
+{
+       struct yaffs_dev *dev = obj->my_dev;
+       int i;
+
+       if (dev->param.n_caches < 1)
+               return NULL;
+
+       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++;
+
+                       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;
+
+       if (dev->param.n_caches < 1)
+               return;
+
+       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;
+
+               dev->cache_last_use = 0;
+       }
+       dev->cache_last_use++;
+       cache->last_use = dev->cache_last_use;
+
+       if (is_write)
+               cache->dirty = 1;
+}
+
+/* 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;
+
+       if (object->my_dev->param.n_caches > 0) {
+               cache = yaffs_find_chunk_cache(object, chunk_id);
+
+               if (cache)
+                       cache->object = NULL;
+       }
+}
+
+/* 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(struct yaffs_obj *obj)
+{
+       int bucket;
+       struct yaffs_dev *dev = obj->my_dev;
+
+       /* If it is still linked into the bucket list, free from the list */
+       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(struct yaffs_obj *obj)
+{
+       struct yaffs_dev *dev;
+
+       if (!obj) {
+               BUG();
+               return;
+       }
+       dev = obj->my_dev;
+       yaffs_trace(YAFFS_TRACE_OS, "FreeObject %p inode %p",
+               obj, obj->my_inode);
+       if (obj->parent)
+               BUG();
+       if (!list_empty(&obj->siblings))
+               BUG();
 
        if (obj->my_inode) {
                /* We're still hooked up to a cached inode.
@@ -1320,40 +1692,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;
 
-       dev->n_obj = 0;
-       dev->n_tnodes = 0;
+       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);
+                       }
 
-       yaffs_init_raw_tnodes_and_objs(dev);
+                       if (tn->internal[i])
+                               has_data++;
+               }
+       } else {
+               int tnode_size_u32 = dev->tnode_size / sizeof(u32);
+               u32 *map = (u32 *) tn;
 
-       for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-               YINIT_LIST_HEAD(&dev->obj_bucket[i].list);
-               dev->obj_bucket[i].count = 0;
+               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_find_nice_bucket(yaffs_dev_t *dev)
+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;
+
+       if (file_struct->top_level < 1)
+               return YAFFS_OK;
+
+       file_struct->top =
+          yaffs_prune_worker(dev, file_struct->top, file_struct->top_level, 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;
+}
+
+/*-------------------- 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 +1910,69 @@ 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);
-
-       /* 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();  */
+       struct list_head *i;
+       u32 n = (u32) bucket;
 
+       /*
+        * Now find an object value that has not already been taken
+        * by scanning the list, incrementing each time by number of buckets.
+        */
        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) {
-                               /* If there is already one in the list */
-                               if (i && ylist_entry(i, yaffs_obj_t,
-                                               hash_link)->obj_id == n) {
-                                       found = 0;
-                               }
-                       }
+               list_for_each(i, &dev->obj_bucket[bucket].list) {
+                       /* Check if this value is already taken. */
+                       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 *the_obj=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);
@@ -1452,65 +1984,87 @@ yaffs_obj_t *yaffs_new_obj(yaffs_dev_t *dev, int number,
        }
 
        the_obj = yaffs_alloc_empty_obj(dev);
-       if (!the_obj){
-               if(tn)
-                       yaffs_free_tnode(dev,tn);
+       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 (the_obj) {
-               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;
-#ifdef CONFIG_YAFFS_WINCE
-               yfsd_win_file_time_now(the_obj->win_atime);
-               the_obj->win_ctime[0] = the_obj->win_mtime[0] =
-                   the_obj->win_atime[0];
-               the_obj->win_ctime[1] = the_obj->win_mtime[1] =
-                   the_obj->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)
+{
 
-               the_obj->yst_atime = the_obj->yst_mtime =
-                   the_obj->yst_ctime = Y_CURRENT_TIME;
-#endif
-               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 = 0xFFFFFFFF; /* max __u32 */
-                       the_obj->variant.file_variant.top_level = 0;
-                       the_obj->variant.file_variant.top = tn;
-                       break;
-               case YAFFS_OBJECT_TYPE_DIRECTORY:
-                       YINIT_LIST_HEAD(&the_obj->variant.dir_variant.
-                                       children);
-                       YINIT_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;
-               }
-       }
+       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;
 
-       return the_obj;
 }
 
-yaffs_obj_t *yaffs_find_or_create_by_number(yaffs_dev_t *dev,
-                                               int number,
-                                               yaffs_obj_type type)
+
+static void yaffs_init_tnodes_and_objs(struct yaffs_dev *dev)
 {
-       yaffs_obj_t *the_obj = NULL;
+       int i;
+
+       dev->n_obj = 0;
+       dev->n_tnodes = 0;
+       yaffs_init_raw_tnodes_and_objs(dev);
+
+       for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
+               INIT_LIST_HEAD(&dev->obj_bucket[i].list);
+               dev->obj_bucket[i].count = 0;
+       }
+}
+
+struct yaffs_obj *yaffs_find_or_create_by_number(struct yaffs_dev *dev,
+                                                int number,
+                                                enum yaffs_obj_type type)
+{
+       struct yaffs_obj *the_obj = NULL;
 
        if (number > 0)
                the_obj = yaffs_find_by_number(dev, number);
@@ -1522,7 +2076,6 @@ yaffs_obj_t *yaffs_find_or_create_by_number(yaffs_dev_t *dev,
 
 }
 
-
 YCHAR *yaffs_clone_str(const YCHAR *str)
 {
        YCHAR *new_str = NULL;
@@ -1531,15 +2084,79 @@ YCHAR *yaffs_clone_str(const YCHAR *str)
        if (!str)
                str = _Y("");
 
-       len = yaffs_strnlen(str,YAFFS_MAX_ALIAS_LENGTH);
-       new_str = YMALLOC((len + 1) * sizeof(YCHAR));
-       if (new_str){
-               yaffs_strncpy(new_str, str,len);
+       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);
+       }
+}
+
+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.
@@ -1548,21 +2165,21 @@ YCHAR *yaffs_clone_str(const YCHAR *str)
  * 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 *alias_str, __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;
 
@@ -1574,328 +2191,200 @@ static yaffs_obj_t *yaffs_create_obj(yaffs_obj_type type,
 
        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_add_obj_to_dir(parent, in);
-
-               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;
-               }
-
-               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;
-               }
-
-               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)
-{
-       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)
-{
-       return yaffs_create_obj(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
-                                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)
-{
-       return yaffs_create_obj(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
-                                uid, gid, NULL, NULL, rdev);
-}
+       yaffs_set_obj_name(in, name);
+       in->dirty = 1;
 
-yaffs_obj_t *yaffs_create_symlink(yaffs_obj_t *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_add_obj_to_dir(parent, in);
 
-/* 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)
-{
-       /* Get the real object in case we were fed a hard link as an equivalent object */
-       equiv_obj = yaffs_get_equivalent_obj(equiv_obj);
+       in->my_dev = parent->my_dev;
 
-       if (yaffs_create_obj
-           (YAFFS_OBJECT_TYPE_HARDLINK, parent, name, 0, 0, 0,
-            equiv_obj, NULL, 0)) {
-               return equiv_obj;
-       } else {
-               return NULL;
+       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;
        }
 
-}
-
-static int yaffs_change_obj_name(yaffs_obj_t *obj, yaffs_obj_t *new_dir,
-                               const YCHAR *new_name, int force, int shadows)
-{
-       int unlink_op;
-       int del_op;
-
-       yaffs_obj_t *existing_target;
-
-       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();
+       if (yaffs_update_oh(in, name, 0, 0, 0, NULL) < 0) {
+               /* Could not create the object header, fail */
+               yaffs_del_obj(in);
+               in = NULL;
        }
 
-       /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
-       if (obj->my_dev->param.is_yaffs2)
-               unlink_op = (new_dir == obj->my_dev->unlinked_dir);
-       else
-               unlink_op = (new_dir == obj->my_dev->unlinked_dir
-                           && obj->variant_type == YAFFS_OBJECT_TYPE_FILE);
-
-       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 allowed.
-        *   else only proceed if the new name does not exist and if 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) {
-               yaffs_set_obj_name(obj, new_name);
-               obj->dirty = 1;
+       if (in)
+               yaffs_update_parent(parent);
 
-               yaffs_add_obj_to_dir(new_dir, obj);
+       return in;
+}
 
-               if (unlink_op)
-                       obj->unlinked = 1;
+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);
+}
 
-               /* If it is a deletion then we mark it as a shrink for gc purposes. */
-               if (yaffs_update_oh(obj, new_name, 0, del_op, shadows, NULL) >= 0)
-                       return YAFFS_OK;
-       }
+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);
+}
 
-       return YAFFS_FAIL;
+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);
 }
 
-int yaffs_rename_obj(yaffs_obj_t *old_dir, const YCHAR *old_name,
-               yaffs_obj_t *new_dir, const YCHAR *new_name)
+struct yaffs_obj *yaffs_create_symlink(struct yaffs_obj *parent,
+                                      const YCHAR *name, u32 mode, u32 uid,
+                                      u32 gid, const YCHAR *alias)
 {
-       yaffs_obj_t *obj = NULL;
-       yaffs_obj_t *existing_target = NULL;
-       int force = 0;
-       int result;
-       yaffs_dev_t *dev;
+       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.*/
+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 obj */
+       equiv_obj = yaffs_get_equivalent_obj(equiv_obj);
 
-       if (!old_dir || old_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
-               YBUG();
-       if (!new_dir || new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
-               YBUG();
+       if (yaffs_create_obj(YAFFS_OBJECT_TYPE_HARDLINK,
+                       parent, name, 0, 0, 0,
+                       equiv_obj, NULL, 0))
+               return equiv_obj;
 
-       dev = old_dir->my_dev;
+       return NULL;
 
-#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);
 
-               existing_target = yaffs_find_by_name(new_dir, new_name);
-               if (existing_target &&
-                       existing_target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
-                       !ylist_empty(&existing_target->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 (existing_target && existing_target != 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,
-                                               existing_target->obj_id);
-                       existing_target->is_shadowed = 1;
-                       yaffs_unlink_obj(existing_target);
-                       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 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(n_blocks * 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(n_blocks * 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 * n_blocks);
-               if (!dev->chunk_bits) {
-                       dev->chunk_bits = YMALLOC_ALT(dev->chunk_bit_stride * n_blocks);
-                       dev->chunk_bits_alt = 1;
-               } else
-                       dev->chunk_bits_alt = 0;
-       }
-
-       if (dev->block_info && dev->chunk_bits) {
-               memset(dev->block_info, 0, n_blocks * sizeof(yaffs_block_info_t));
-               memset(dev->chunk_bits, 0, dev->chunk_bit_stride * n_blocks);
-               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);
 
+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;
        }
@@ -1905,422 +2394,255 @@ void yaffs_block_became_dirty(yaffs_dev_t *dev, int block_no)
                erased_ok = yaffs_erase_block(dev, block_no);
                if (!erased_ok) {
                        dev->n_erase_failures++;
-                       T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-                         (TSTR("**>> Erasure failed %d" TENDSTR), block_no));
+                       yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+                         "**>> Erasure failed %d", block_no);
                }
        }
 
+       /* Verify erasure if needed */
        if (erased_ok &&
-           ((yaffs_trace_mask & YAFFS_TRACE_ERASE) || !yaffs_skip_verification(dev))) {
-               int i;
+           ((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)) {
-                               T(YAFFS_TRACE_ERROR,
-                                 (TSTR
-                                  (">>Block %d erasure supposedly OK, but chunk %d not erased"
-                                   TENDSTR), block_no, 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);
                        }
                }
        }
 
-       if (erased_ok) {
-               /* 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 */
-
+       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);
-               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;
-               }
+               yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
+                       "**>> Block %d retired", block_no);
+               return;
        }
 
-       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 reserved_chunks;
-       int reserved_blocks = dev->param.n_reserved_blocks;
-       int checkpt_blocks;
-
-       checkpt_blocks = yaffs_calc_checkpt_blocks_required(dev);
+       /* 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;
 
-       reserved_chunks = ((reserved_blocks + checkpt_blocks) * dev->param.chunks_per_block);
+       yaffs_clear_chunk_bits(dev, block_no);
 
-       return (dev->n_free_chunks > (reserved_chunks + n_chunks));
+       yaffs_trace(YAFFS_TRACE_ERASE, "Erased block %d", block_no);
 }
 
-static int yaffs_alloc_chunk(yaffs_dev_t *dev, int use_reserver,
-               yaffs_block_info_t **block_ptr)
+static inline int yaffs_gc_process_chunk(struct yaffs_dev *dev,
+                                       struct yaffs_block_info *bi,
+                                       int old_chunk, u8 *buffer)
 {
-       int ret_val;
-       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 (!use_reserver && !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);
-
-               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);
+       int new_chunk;
+       int mark_flash = 1;
+       struct yaffs_ext_tags tags;
+       struct yaffs_obj *object;
+       int matching_chunk;
+       int ret_val = YAFFS_OK;
 
-               dev->alloc_page++;
+       memset(&tags, 0, sizeof(tags));
+       yaffs_rd_chunk_tags_nand(dev, old_chunk,
+                                buffer, &tags);
+       object = yaffs_find_by_number(dev, tags.obj_id);
+
+       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);
+
+       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--;
 
-               /* 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;
+               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++;
                }
+               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;
+                       }
 
-               if (block_ptr)
-                       *block_ptr = bi;
-
-               return ret_val;
-       }
-
-       T(YAFFS_TRACE_ERROR,
-                       (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
-
-       return -1;
-}
-
-static int yaffs_get_erased_chunks(yaffs_dev_t *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);
+                       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);
+               }
 
-       return n;
+               if (new_chunk < 0) {
+                       ret_val = YAFFS_FAIL;
+               } else {
 
-}
+                       /* Now fix up the Tnodes etc. */
 
-/*
- * 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;
+                       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;
 }
 
-
-static int yaffs_gc_block(yaffs_dev_t *dev, int block,
-               int whole_block)
+static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block)
 {
        int old_chunk;
-       int new_chunk;
-       int mark_flash;
        int ret_val = YAFFS_OK;
        int i;
        int is_checkpt_block;
-       int matching_chunk;
        int max_copies;
-
        int chunks_before = yaffs_get_erased_chunks(dev);
        int chunks_after;
-
-       yaffs_ext_tags tags;
-
-       yaffs_block_info_t *bi = yaffs_get_block_info(dev, block);
-
-       yaffs_obj_t *object;
+       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, whole_block %d" TENDSTR),
-                        block,
-                        bi->pages_in_use,
-                        bi->has_shrink_hdr,
-                        whole_block));
+       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 (is_checkpt_block ||
-                       !yaffs_still_some_chunks(dev, block)) {
-               T(YAFFS_TRACE_TRACING,
-                               (TSTR
-                                ("Collecting block %d that has no chunks in use" TENDSTR),
-                                block));
-               yaffs_block_became_dirty(dev, block);
-       } else {
-
-               __u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
-
-               yaffs_verify_blk(dev, bi, block);
-
-               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 */;
-                    ret_val == YAFFS_OK &&
-                    dev->gc_chunk < dev->param.chunks_per_block &&
-                    (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) &&
-                    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 */
-
-                               max_copies--;
-
-                               mark_flash = 1;
-
-                               yaffs_init_tags(&tags);
-
-                               yaffs_rd_chunk_tags_nand(dev, old_chunk,
-                                                               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)
-                                               matching_chunk = object->hdr_chunk;
-                                       else if (object->soft_del)
-                                               matching_chunk = old_chunk; /* Defeat the test */
-                                       else
-                                               matching_chunk = yaffs_find_chunk_in_file(object, tags.chunk_id, NULL);
-
-                                       if (old_chunk != matching_chunk)
-                                               T(YAFFS_TRACE_ERROR,
-                                                 (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
-                                                 old_chunk, matching_chunk, tags.obj_id, tags.chunk_id));
-
-                               }
-
-                               if (!object) {
-                                       T(YAFFS_TRACE_ERROR,
-                                         (TSTR
-                                          ("page %d in gc has no object: %d %d %d "
-                                           TENDSTR), 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--;
-
-                                       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 shrink_header 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);
-                                               new_chunk =
-                                                   yaffs_write_new_chunk(dev,(__u8 *) oh, &tags, 1);
-                                       } else
-                                               new_chunk =
-                                                   yaffs_write_new_chunk(dev, buffer, &tags, 1);
-
-                                       if (new_chunk < 0) {
-                                               ret_val = YAFFS_FAIL;
-                                       } else {
-
-                                               /* Ok, now fix up the Tnodes etc. */
-
-                                               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 */
-                                                       int ok;
-                                                       ok = 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__);
+       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 {
 
-               yaffs_release_temp_buffer(dev, buffer, __LINE__);
+               u8 *buffer = yaffs_get_temp_buffer(dev);
 
+               yaffs_verify_blk(dev, bi, block);
 
+               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 */ ;
+                    ret_val == YAFFS_OK &&
+                    dev->gc_chunk < dev->param.chunks_per_block &&
+                    (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) &&
+                    max_copies > 0;
+                    dev->gc_chunk++, old_chunk++) {
+                       if (yaffs_check_chunk_bit(dev, block, dev->gc_chunk)) {
+                               /* 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);
        }
 
        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 +2654,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--;
                        }
 
                }
-
-
                chunks_after = yaffs_get_erased_chunks(dev);
-               if (chunks_before >= chunks_after) {
-                       T(YAFFS_TRACE_GC,
-                         (TSTR
-                          ("gc did not increase free chunks before %d after %d"
-                           TENDSTR), chunks_before, chunks_after));
-               }
+               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;
@@ -2369,20 +2684,19 @@ static int yaffs_gc_block(yaffs_dev_t *dev, int block,
 }
 
 /*
- * 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 prioritised_exist = 0;
-       yaffs_block_info_t *bi;
+       struct yaffs_block_info *bi;
        int threshold;
 
        /* First let's see if we need to grab a prioritised block */
@@ -2390,13 +2704,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) {
                                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,47 +2719,46 @@ 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(prioritised_exist &&
-                       !selected &&
-                       dev->oldest_dirty_block > 0)
+               if (prioritised_exist &&
+                   !selected && dev->oldest_dirty_block > 0)
                        selected = dev->oldest_dirty_block;
 
-               if (!prioritised_exist) /* 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){
+       if (!selected) {
                int pages_used;
-               int n_blocks = dev->internal_end_block - dev->internal_start_block + 1;
-               if (aggressive){
+               int n_blocks =
+                   dev->internal_end_block - dev->internal_start_block + 1;
+               if (aggressive) {
                        threshold = dev->param.chunks_per_block;
                        iterations = n_blocks;
                } else {
                        int max_threshold;
 
-                       if(background)
-                               max_threshold = dev->param.chunks_per_block/2;
+                       if (background)
+                               max_threshold = dev->param.chunks_per_block / 2;
                        else
-                               max_threshold = dev->param.chunks_per_block/8;
+                               max_threshold = dev->param.chunks_per_block / 8;
 
-                       if(max_threshold <  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 > max_threshold)
+                       if (threshold > max_threshold)
                                threshold = max_threshold;
 
                        iterations = n_blocks / 16 + 1;
@@ -2455,75 +2767,77 @@ static unsigned yaffs_find_gc_block(yaffs_dev_t *dev,
                }
 
                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);
+                    i++) {
                        dev->gc_block_finder++;
                        if (dev->gc_block_finder < dev->internal_start_block ||
-                               dev->gc_block_finder > dev->internal_end_block)
-                               dev->gc_block_finder = dev->internal_start_block;
+                           dev->gc_block_finder > dev->internal_end_block)
+                               dev->gc_block_finder =
+                                   dev->internal_start_block;
 
                        bi = yaffs_get_block_info(dev, dev->gc_block_finder);
 
                        pages_used = bi->pages_in_use - bi->soft_del_pages;
 
                        if (bi->block_state == YAFFS_BLOCK_STATE_FULL &&
-                               pages_used < dev->param.chunks_per_block &&
-                               (dev->gc_dirtiest < 1 || pages_used < dev->gc_pages_in_use) &&
-                               yaffs_block_ok_for_gc(dev, bi)) {
+                           pages_used < dev->param.chunks_per_block &&
+                           (dev->gc_dirtiest < 1 ||
+                            pages_used < dev->gc_pages_in_use) &&
+                           yaffs_block_ok_for_gc(dev, bi)) {
                                dev->gc_dirtiest = dev->gc_block_finder;
                                dev->gc_pages_in_use = pages_used;
                        }
                }
 
-               if(dev->gc_dirtiest > 0 && dev->gc_pages_in_use <= threshold)
+               if (dev->gc_dirtiest > 0 && dev->gc_pages_in_use <= threshold)
                        selected = dev->gc_dirtiest;
        }
 
        /*
-        * If nothing has been selected for a while, try selecting the oldest dirty
+        * If nothing has been selected for a while, try the oldest dirty
         * because that's gumming up the works.
         */
 
-       if(!selected && dev->param.is_yaffs2 &&
-               dev->gc_not_done >= ( background ? 10 : 20)){
+       if (!selected && dev->param.is_yaffs2 &&
+           dev->gc_not_done >= (background ? 10 : 20)) {
                yaffs2_find_oldest_dirty_seq(dev);
-               if(dev->oldest_dirty_block > 0) {
+               if (dev->oldest_dirty_block > 0) {
                        selected = dev->oldest_dirty_block;
                        dev->gc_dirtiest = selected;
                        dev->oldest_dirty_gc_count++;
                        bi = yaffs_get_block_info(dev, selected);
-                       dev->gc_pages_in_use =  bi->pages_in_use - bi->soft_del_pages;
-               } else
+                       dev->gc_pages_in_use =
+                           bi->pages_in_use - bi->soft_del_pages;
+               } else {
                        dev->gc_not_done = 0;
+               }
        }
 
-       if(selected){
-               T(YAFFS_TRACE_GC,
-                 (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR),
-                 selected,
-                 dev->param.chunks_per_block - dev->gc_pages_in_use,
-                 prioritised));
+       if (selected) {
+               yaffs_trace(YAFFS_TRACE_GC,
+                       "GC Selected block %d with %d free, prioritised:%d",
+                       selected,
+                       dev->param.chunks_per_block - dev->gc_pages_in_use,
+                       prioritised);
 
                dev->n_gc_blocks++;
-               if(background)
+               if (background)
                        dev->bg_gcs++;
 
                dev->gc_dirtiest = 0;
                dev->gc_pages_in_use = 0;
                dev->gc_not_done = 0;
-               if(dev->refresh_skip > 0)
+               if (dev->refresh_skip > 0)
                        dev->refresh_skip--;
-       } else{
+       } else {
                dev->gc_not_done++;
-               T(YAFFS_TRACE_GC,
-                 (TSTR("GC none: finder %d skip %d threshold %d dirtiest %d using %d oldest %d%s" TENDSTR),
-                 dev->gc_block_finder, dev->gc_not_done,
-                 threshold,
-                 dev->gc_dirtiest, dev->gc_pages_in_use,
-                 dev->oldest_dirty_block,
-                 background ? " bg" : ""));
+               yaffs_trace(YAFFS_TRACE_GC,
+                       "GC none: finder %d skip %d threshold %d dirtiest %d using %d oldest %d%s",
+                       dev->gc_block_finder, dev->gc_not_done, threshold,
+                       dev->gc_dirtiest, dev->gc_pages_in_use,
+                       dev->oldest_dirty_block, background ? " bg" : "");
        }
 
        return selected;
@@ -2533,12 +2847,12 @@ static unsigned yaffs_find_gc_block(yaffs_dev_t *dev,
  * If we're very low on erased blocks then we do aggressive garbage collection
  * otherwise we do "leasurely" garbage collection.
  * Aggressive gc looks further (whole array) and will accept less dirty blocks.
- * Passive gc only inspects smaller areas and will only accept more dirty blocks.
+ * Passive gc only inspects smaller areas and only accepts more dirty blocks.
  *
  * The idea is to help clear out space in a more spread-out manner.
  * Dunno if it really does anything useful.
  */
-static int yaffs_check_gc(yaffs_dev_t *dev, int background)
+static int yaffs_check_gc(struct yaffs_dev *dev, int background)
 {
        int aggressive = 0;
        int gc_ok = YAFFS_OK;
@@ -2547,17 +2861,16 @@ static int yaffs_check_gc(yaffs_dev_t *dev, int background)
        int erased_chunks;
        int checkpt_block_adjust;
 
-       if(dev->param.gc_control &&
-               (dev->param.gc_control(dev) & 1) == 0)
+       if (dev->param.gc_control_fn &&
+               (dev->param.gc_control_fn(dev) & 1) == 0)
                return YAFFS_OK;
 
-       if (dev->gc_disable) {
+       if (dev->gc_disable)
                /* Bail out so we don't get recursive gc */
                return YAFFS_OK;
-       }
 
        /* This loop should pass the first time.
-        * We'll only see looping here if the collection does not increase space.
+        * Only loops here if the collection does not increase space.
         */
 
        do {
@@ -2565,21 +2878,23 @@ static int yaffs_check_gc(yaffs_dev_t *dev, int background)
 
                checkpt_block_adjust = yaffs_calc_checkpt_blocks_required(dev);
 
-               min_erased  = dev->param.n_reserved_blocks + checkpt_block_adjust + 1;
-               erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_block;
+               min_erased =
+                   dev->param.n_reserved_blocks + checkpt_block_adjust + 1;
+               erased_chunks =
+                   dev->n_erased_blocks * dev->param.chunks_per_block;
 
-               /* If we need a block soon then do aggressive gc.*/
+               /* If we need a block soon then do aggressive gc. */
                if (dev->n_erased_blocks < min_erased)
                        aggressive = 1;
                else {
-                       if(!background && erased_chunks > (dev->n_free_chunks / 4))
+                       if (!background
+                           && erased_chunks > (dev->n_free_chunks / 4))
                                break;
 
-                       if(dev->gc_skip > 20)
+                       if (dev->gc_skip > 20)
                                dev->gc_skip = 20;
-                       if(erased_chunks < dev->n_free_chunks/2 ||
-                               dev->gc_skip < 1 ||
-                               background)
+                       if (erased_chunks < dev->n_free_chunks / 2 ||
+                           dev->gc_skip < 1 || background)
                                aggressive = 0;
                        else {
                                dev->gc_skip--;
@@ -2589,17 +2904,19 @@ static int yaffs_check_gc(yaffs_dev_t *dev, int background)
 
                dev->gc_skip = 5;
 
-                /* If we don't already have a block being gc'd then see if we should start another */
+               /* If we don't already have a block being gc'd then see if we
+                * should start another */
 
                if (dev->gc_block < 1 && !aggressive) {
                        dev->gc_block = yaffs2_find_refresh_block(dev);
                        dev->gc_chunk = 0;
-                       dev->n_clean_ups=0;
+                       dev->n_clean_ups = 0;
                }
                if (dev->gc_block < 1) {
-                       dev->gc_block = yaffs_find_gc_block(dev, aggressive, background);
+                       dev->gc_block =
+                           yaffs_find_gc_block(dev, aggressive, background);
                        dev->gc_chunk = 0;
-                       dev->n_clean_ups=0;
+                       dev->n_clean_ups = 0;
                }
 
                if (dev->gc_block > 0) {
@@ -2607,23 +2924,22 @@ static int yaffs_check_gc(yaffs_dev_t *dev, int background)
                        if (!aggressive)
                                dev->passive_gc_count++;
 
-                       T(YAFFS_TRACE_GC,
-                         (TSTR
-                          ("yaffs: GC n_erased_blocks %d aggressive %d" TENDSTR),
-                          dev->n_erased_blocks, aggressive));
+                       yaffs_trace(YAFFS_TRACE_GC,
+                               "yaffs: GC n_erased_blocks %d aggressive %d",
+                               dev->n_erased_blocks, aggressive);
 
                        gc_ok = yaffs_gc_block(dev, dev->gc_block, aggressive);
                }
 
-               if (dev->n_erased_blocks < (dev->param.n_reserved_blocks) && dev->gc_block > 0) {
-                       T(YAFFS_TRACE_GC,
-                         (TSTR
-                          ("yaffs: GC !!!no reclaim!!! n_erased_blocks %d after try %d block %d"
-                           TENDSTR), dev->n_erased_blocks, max_tries, dev->gc_block));
+               if (dev->n_erased_blocks < (dev->param.n_reserved_blocks) &&
+                   dev->gc_block > 0) {
+                       yaffs_trace(YAFFS_TRACE_GC,
+                               "yaffs: GC !!!no reclaim!!! n_erased_blocks %d after try %d block %d",
+                               dev->n_erased_blocks, max_tries,
+                               dev->gc_block);
                }
        } while ((dev->n_erased_blocks < dev->param.n_reserved_blocks) &&
-                (dev->gc_block > 0) &&
-                (max_tries < 2));
+                (dev->gc_block > 0) && (max_tries < 2));
 
        return aggressive ? gc_ok : YAFFS_OK;
 }
@@ -2633,222 +2949,19 @@ static int yaffs_check_gc(yaffs_dev_t *dev, int background)
  * Garbage collects. Intended to be called from a background thread.
  * Returns non-zero if at least half the free chunks are erased.
  */
-int yaffs_bg_gc(yaffs_dev_t *dev, unsigned urgency)
+int yaffs_bg_gc(struct yaffs_dev *dev, unsigned urgency)
 {
        int erased_chunks = dev->n_erased_blocks * dev->param.chunks_per_block;
 
-       T(YAFFS_TRACE_BACKGROUND, (TSTR("Background gc %u" TENDSTR),urgency));
+       yaffs_trace(YAFFS_TRACE_BACKGROUND, "Background gc %u", urgency);
 
        yaffs_check_gc(dev, 1);
-       return erased_chunks > dev->n_free_chunks/2;
-}
-
-/*-------------------------  TAGS --------------------------------*/
-
-static int yaffs_tags_match(const 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;
-
+       return erased_chunks > dev->n_free_chunks / 2;
 }
 
-
 /*-------------------- Data file manipulation -----------------*/
 
-static int yaffs_find_chunk_in_file(yaffs_obj_t *in, int inode_chunk,
-                                yaffs_ext_tags *tags)
-{
-       /*Get the Tnode, then get the level 0 offset chunk offset */
-       yaffs_tnode_t *tn;
-       int the_chunk = -1;
-       yaffs_ext_tags local_tags;
-       int ret_val = -1;
-
-       yaffs_dev_t *dev = in->my_dev;
-
-       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) {
-               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(yaffs_obj_t *in, int inode_chunk,
-                                         yaffs_ext_tags *tags)
-{
-       /* Get the Tnode, then get the level 0 offset chunk offset */
-       yaffs_tnode_t *tn;
-       int the_chunk = -1;
-       yaffs_ext_tags local_tags;
-
-       yaffs_dev_t *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) {
-
-               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(yaffs_obj_t *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.
-        */
-
-       yaffs_tnode_t *tn;
-       yaffs_dev_t *dev = in->my_dev;
-       int existing_cunk;
-       yaffs_ext_tags existing_tags;
-       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) {
-                       T(YAFFS_TRACE_ERROR,
-                         (TSTR
-                          ("yaffs tragedy:attempt to put data chunk into a non-file"
-                           TENDSTR)));
-                       YBUG();
-               }
-
-               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 ever
-                * 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.
-                        * Forward scanning YAFFS2: The new one is what we use, dump the old 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? */
-
-                               T(YAFFS_TRACE_ERROR,
-                                 (TSTR
-                                  ("yaffs tragedy: existing chunk < 0 in scan"
-                                   TENDSTR)));
-
-                       }
-
-                       /* 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;
-                       }
-
-                       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
-                                * Use existing.
-                                * 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;
-                       }
-               }
-
-       }
-
-       if (existing_cunk == 0)
-               in->n_data_chunks++;
-
-       yaffs_load_tnode_0(dev, tn, inode_chunk, nand_chunk);
-
-       return YAFFS_OK;
-}
-
-static int yaffs_rd_data_obj(yaffs_obj_t *in, int inode_chunk,
-                                       __u8 *buffer)
+static int yaffs_rd_data_obj(struct yaffs_obj *in, int inode_chunk, u8 * buffer)
 {
        int nand_chunk = yaffs_find_chunk_in_file(in, inode_chunk, NULL);
 
@@ -2856,9 +2969,9 @@ static int yaffs_rd_data_obj(yaffs_obj_t *in, int inode_chunk,
                return yaffs_rd_chunk_tags_nand(in->my_dev, nand_chunk,
                                                buffer, NULL);
        else {
-               T(YAFFS_TRACE_NANDACCESS,
-                 (TSTR("Chunk %d not found zero instead" TENDSTR),
-                  nand_chunk));
+               yaffs_trace(YAFFS_TRACE_NANDACCESS,
+                       "Chunk %d not found zero instead",
+                       nand_chunk);
                /* get sane (zero) data if you read a hole */
                memset(buffer, 0, in->my_dev->data_bytes_per_chunk);
                return 0;
@@ -2866,12 +2979,13 @@ static int yaffs_rd_data_obj(yaffs_obj_t *in, int inode_chunk,
 
 }
 
-void yaffs_chunk_del(yaffs_dev_t *dev, int chunk_id, int mark_flash, int lyn)
+void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash,
+                    int lyn)
 {
        int block;
        int page;
-       yaffs_ext_tags tags;
-       yaffs_block_info_t *bi;
+       struct yaffs_ext_tags tags;
+       struct yaffs_block_info *bi;
 
        if (chunk_id <= 0)
                return;
@@ -2880,26 +2994,23 @@ void yaffs_chunk_del(yaffs_dev_t *dev, int chunk_id, int mark_flash, int lyn)
        block = chunk_id / dev->param.chunks_per_block;
        page = chunk_id % dev->param.chunks_per_block;
 
-
        if (!yaffs_check_chunk_bit(dev, block, page))
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Deleting invalid chunk %d"TENDSTR),
-                        chunk_id));
+               yaffs_trace(YAFFS_TRACE_VERIFY,
+                       "Deleting invalid chunk %d", chunk_id);
 
        bi = yaffs_get_block_info(dev, block);
-       
+
        yaffs2_update_oldest_dirty_seq(dev, block, bi);
 
-       T(YAFFS_TRACE_DELETION,
-         (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunk_id));
+       yaffs_trace(YAFFS_TRACE_DELETION,
+               "line %d delete of chunk %d",
+               lyn, chunk_id);
 
        if (!dev->param.is_yaffs2 && mark_flash &&
            bi->block_state != YAFFS_BLOCK_STATE_COLLECTING) {
 
-               yaffs_init_tags(&tags);
-
+               memset(&tags, 0, sizeof(tags));
                tags.is_deleted = 1;
-
                yaffs_wr_chunk_tags_nand(dev, chunk_id, NULL, &tags);
                yaffs_handle_chunk_update(dev, chunk_id, &tags);
        } else {
@@ -2911,28 +3022,23 @@ void yaffs_chunk_del(yaffs_dev_t *dev, int chunk_id, int mark_flash, int lyn)
         */
        if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING ||
            bi->block_state == YAFFS_BLOCK_STATE_FULL ||
-           bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
+           bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCAN ||
            bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) {
                dev->n_free_chunks++;
-
                yaffs_clear_chunk_bit(dev, block, page);
-
                bi->pages_in_use--;
 
                if (bi->pages_in_use == 0 &&
                    !bi->has_shrink_hdr &&
                    bi->block_state != YAFFS_BLOCK_STATE_ALLOCATING &&
-                   bi->block_state != YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
+                   bi->block_state != YAFFS_BLOCK_STATE_NEEDS_SCAN) {
                        yaffs_block_became_dirty(dev, block);
                }
-
        }
-
 }
 
-static int yaffs_wr_data_obj(yaffs_obj_t *in, int inode_chunk,
-                                       const __u8 *buffer, int n_bytes,
-                                       int use_reserve)
+static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk,
+                            const u8 *buffer, int n_bytes, int use_reserve)
 {
        /* Find old chunk Need to do this to get serial number
         * Write new one and patch into tree.
@@ -2940,26 +3046,24 @@ static int yaffs_wr_data_obj(yaffs_obj_t *in, int inode_chunk,
         */
 
        int prev_chunk_id;
-       yaffs_ext_tags prev_tags;
-
+       struct yaffs_ext_tags prev_tags;
        int new_chunk_id;
-       yaffs_ext_tags new_tags;
-
-       yaffs_dev_t *dev = in->my_dev;
+       struct yaffs_ext_tags new_tags;
+       struct yaffs_dev *dev = in->my_dev;
 
-       yaffs_check_gc(dev,0);
+       yaffs_check_gc(dev, 0);
 
        /* Get the previous chunk at this location in the file if it exists.
         * If it does not exist then put a zero into the tree. This creates
         * the tnode now, rather than later when it is harder to clean up.
         */
        prev_chunk_id = yaffs_find_chunk_in_file(in, inode_chunk, &prev_tags);
-       if(prev_chunk_id < 1 &&
-               !yaffs_put_chunk_in_file(in, inode_chunk, 0, 0))
+       if (prev_chunk_id < 1 &&
+           !yaffs_put_chunk_in_file(in, inode_chunk, 0, 0))
                return 0;
 
        /* Set up new tags */
-       yaffs_init_tags(&new_tags);
+       memset(&new_tags, 0, sizeof(new_tags));
 
        new_tags.chunk_id = inode_chunk;
        new_tags.obj_id = in->obj_id;
@@ -2968,15 +3072,14 @@ static int yaffs_wr_data_obj(yaffs_obj_t *in, int inode_chunk,
        new_tags.n_bytes = n_bytes;
 
        if (n_bytes < 1 || n_bytes > dev->param.total_bytes_per_chunk) {
-               T(YAFFS_TRACE_ERROR,
-               (TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), n_bytes));
-               YBUG();
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                 "Writing %d bytes to chunk!!!!!!!!!",
+                  n_bytes);
+               BUG();
        }
-       
-               
+
        new_chunk_id =
-           yaffs_write_new_chunk(dev, buffer, &new_tags,
-                                             use_reserve);
+           yaffs_write_new_chunk(dev, buffer, &new_tags, use_reserve);
 
        if (new_chunk_id > 0) {
                yaffs_put_chunk_in_file(in, inode_chunk, new_chunk_id, 0);
@@ -2990,440 +3093,306 @@ static int yaffs_wr_data_obj(yaffs_obj_t *in, int inode_chunk,
 
 }
 
-/* UpdateObjectHeader updates the header on NAND for an object.
- * If name is not NULL, then that new name is used.
- */
-int yaffs_update_oh(yaffs_obj_t *in, const YCHAR *name, int force,
-                            int is_shrink, int shadows, yaffs_xattr_mod *xmod)
-{
-
-       yaffs_block_info_t *bi;
-
-       yaffs_dev_t *dev = in->my_dev;
-
-       int prev_chunk_id;
-       int ret_val = 0;
-       int result = 0;
-
-       int new_chunk_id;
-       yaffs_ext_tags new_tags;
-       yaffs_ext_tags old_tags;
-       const YCHAR *alias = NULL;
-
-       __u8 *buffer = NULL;
-       YCHAR old_name[YAFFS_MAX_NAME_LENGTH + 1];
-
-       yaffs_obj_header *oh = NULL;
-
-       yaffs_strcpy(old_name, _Y("silly old name"));
-
 
-       if (!in->fake ||
-               in == dev->root_dir || /* The root_dir should also be saved */
-               force  || xmod) {
 
-               yaffs_check_gc(dev,0);
-               yaffs_check_obj_details_loaded(in);
-
-               buffer = yaffs_get_temp_buffer(in->my_dev, __LINE__);
-               oh = (yaffs_obj_header *) buffer;
-
-               prev_chunk_id = in->hdr_chunk;
-
-               if (prev_chunk_id > 0) {
-                       result = yaffs_rd_chunk_tags_nand(dev, prev_chunk_id,
-                                                       buffer, &old_tags);
-
-                       yaffs_verify_oh(in, oh, &old_tags, 0);
-
-                       memcpy(old_name, oh->name, sizeof(oh->name));
-                       memset(buffer, 0xFF, sizeof(yaffs_obj_header));
-               } else
-                       memset(buffer, 0xFF, dev->data_bytes_per_chunk);
-
-               oh->type = in->variant_type;
-               oh->yst_mode = in->yst_mode;
-               oh->shadows_obj = oh->inband_shadowed_obj_id = shadows;
-
-#ifdef CONFIG_YAFFS_WINCE
-               oh->win_atime[0] = in->win_atime[0];
-               oh->win_ctime[0] = in->win_ctime[0];
-               oh->win_mtime[0] = in->win_mtime[0];
-               oh->win_atime[1] = in->win_atime[1];
-               oh->win_ctime[1] = in->win_ctime[1];
-               oh->win_mtime[1] = in->win_mtime[1];
-#else
-               oh->yst_uid = in->yst_uid;
-               oh->yst_gid = in->yst_gid;
-               oh->yst_atime = in->yst_atime;
-               oh->yst_mtime = in->yst_mtime;
-               oh->yst_ctime = in->yst_ctime;
-               oh->yst_rdev = in->yst_rdev;
-#endif
-               if (in->parent)
-                       oh->parent_obj_id = in->parent->obj_id;
-               else
-                       oh->parent_obj_id = 0;
-
-               if (name && *name) {
-                       memset(oh->name, 0, sizeof(oh->name));
-                       yaffs_load_oh_from_name(dev,oh->name,name);
-               } else if (prev_chunk_id > 0)
-                       memcpy(oh->name, old_name, sizeof(oh->name));
-               else
-                       memset(oh->name, 0, sizeof(oh->name));
-
-               oh->is_shrink = is_shrink;
-
-               switch (in->variant_type) {
-               case YAFFS_OBJECT_TYPE_UNKNOWN:
-                       /* Should not happen */
-                       break;
-               case YAFFS_OBJECT_TYPE_FILE:
-                       oh->file_size =
-                           (oh->parent_obj_id == YAFFS_OBJECTID_DELETED
-                            || oh->parent_obj_id ==
-                            YAFFS_OBJECTID_UNLINKED) ? 0 : in->variant.
-                           file_variant.file_size;
-                       break;
-               case YAFFS_OBJECT_TYPE_HARDLINK:
-                       oh->equiv_id =
-                           in->variant.hardlink_variant.equiv_id;
-                       break;
-               case YAFFS_OBJECT_TYPE_SPECIAL:
-                       /* Do nothing */
-                       break;
-               case YAFFS_OBJECT_TYPE_DIRECTORY:
-                       /* Do nothing */
-                       break;
-               case YAFFS_OBJECT_TYPE_SYMLINK:
-                       alias = in->variant.symlink_variant.alias;
-                       if(!alias)
-                               alias = _Y("no alias");
-                       yaffs_strncpy(oh->alias,
-                                       alias,
-                                     YAFFS_MAX_ALIAS_LENGTH);
-                       oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0;
-                       break;
-               }
-
-               /* process any xattrib modifications */
-               if(xmod)
-                       yaffs_apply_xattrib_mod(in, (char *)buffer, xmod);
-
-
-               /* Tags */
-               yaffs_init_tags(&new_tags);
-               in->serial++;
-               new_tags.chunk_id = 0;
-               new_tags.obj_id = in->obj_id;
-               new_tags.serial_number = in->serial;
-
-               /* Add extra info for file header */
-
-               new_tags.extra_available = 1;
-               new_tags.extra_parent_id = oh->parent_obj_id;
-               new_tags.extra_length = oh->file_size;
-               new_tags.extra_is_shrink = oh->is_shrink;
-               new_tags.extra_equiv_id = oh->equiv_id;
-               new_tags.extra_shadows = (oh->shadows_obj > 0) ? 1 : 0;
-               new_tags.extra_obj_type = in->variant_type;
-
-               yaffs_verify_oh(in, oh, &new_tags, 1);
-
-               /* Create new chunk in NAND */
-               new_chunk_id =
-                   yaffs_write_new_chunk(dev, buffer, &new_tags,
-                                                     (prev_chunk_id > 0) ? 1 : 0);
-
-               if (new_chunk_id >= 0) {
-
-                       in->hdr_chunk = new_chunk_id;
-
-                       if (prev_chunk_id > 0) {
-                               yaffs_chunk_del(dev, prev_chunk_id, 1,
-                                                 __LINE__);
-                       }
-
-                       if (!yaffs_obj_cache_dirty(in))
-                               in->dirty = 0;
-
-                       /* If this was a shrink, then mark the block that the chunk lives on */
-                       if (is_shrink) {
-                               bi = yaffs_get_block_info(in->my_dev,
-                                       new_chunk_id / in->my_dev->param.chunks_per_block);
-                               bi->has_shrink_hdr = 1;
-                       }
-
-               }
-
-               ret_val = new_chunk_id;
+static int yaffs_do_xattrib_mod(struct yaffs_obj *obj, int set,
+                               const YCHAR *name, const void *value, int size,
+                               int flags)
+{
+       struct yaffs_xattr_mod xmod;
+       int result;
 
-       }
+       xmod.set = set;
+       xmod.name = name;
+       xmod.data = value;
+       xmod.size = size;
+       xmod.flags = flags;
+       xmod.result = -ENOSPC;
 
-       if (buffer)
-               yaffs_release_temp_buffer(dev, buffer, __LINE__);
+       result = yaffs_update_oh(obj, NULL, 0, 0, 0, &xmod);
 
-       return ret_val;
+       if (result > 0)
+               return xmod.result;
+       else
+               return -ENOSPC;
 }
 
-/*------------------------ Short Operations Cache ----------------------------------------
- *   In many situations where there is no high level buffering (eg WinCE) 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 aand the short op cache provides write
- *   buffering.
- *
- *   There are a limited number (~10) of cache chunks per device so that we don't
- *   need a very intelligent search.
- */
-
-static int yaffs_obj_cache_dirty(yaffs_obj_t *obj)
+static int yaffs_apply_xattrib_mod(struct yaffs_obj *obj, char *buffer,
+                                  struct yaffs_xattr_mod *xmod)
 {
-       yaffs_dev_t *dev = obj->my_dev;
-       int i;
-       yaffs_cache_t *cache;
-       int n_caches = obj->my_dev->param.n_caches;
+       int retval = 0;
+       int x_offs = sizeof(struct yaffs_obj_hdr);
+       struct yaffs_dev *dev = obj->my_dev;
+       int x_size = dev->data_bytes_per_chunk - sizeof(struct yaffs_obj_hdr);
+       char *x_buffer = buffer + x_offs;
+
+       if (xmod->set)
+               retval =
+                   nval_set(x_buffer, x_size, xmod->name, xmod->data,
+                            xmod->size, xmod->flags);
+       else
+               retval = nval_del(x_buffer, x_size, xmod->name);
 
-       for (i = 0; i < n_caches; i++) {
-               cache = &dev->cache[i];
-               if (cache->object == obj &&
-                   cache->dirty)
-                       return 1;
-       }
+       obj->has_xattr = nval_hasvalues(x_buffer, x_size);
+       obj->xattr_known = 1;
+       xmod->result = retval;
 
-       return 0;
+       return retval;
 }
 
-
-static void yaffs_flush_file_cache(yaffs_obj_t *obj)
+static int yaffs_do_xattrib_fetch(struct yaffs_obj *obj, const YCHAR *name,
+                                 void *value, int size)
 {
-       yaffs_dev_t *dev = obj->my_dev;
-       int lowest = -99;       /* Stop compiler whining. */
-       int i;
-       yaffs_cache_t *cache;
-       int chunk_written = 0;
-       int n_caches = obj->my_dev->param.n_caches;
+       char *buffer = NULL;
+       int result;
+       struct yaffs_ext_tags tags;
+       struct yaffs_dev *dev = obj->my_dev;
+       int x_offs = sizeof(struct yaffs_obj_hdr);
+       int x_size = dev->data_bytes_per_chunk - sizeof(struct yaffs_obj_hdr);
+       char *x_buffer;
+       int retval = 0;
 
-       if (n_caches > 0) {
-               do {
-                       cache = NULL;
-
-                       /* Find the dirty cache for this object with the lowest chunk id. */
-                       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;
-                                       }
-                               }
-                       }
+       if (obj->hdr_chunk < 1)
+               return -ENODATA;
 
-                       if (cache && !cache->locked) {
-                               /* Write it out and free it up */
+       /* If we know that the object has no xattribs then don't do all the
+        * reading and parsing.
+        */
+       if (obj->xattr_known && !obj->has_xattr) {
+               if (name)
+                       return -ENODATA;
+               else
+                       return 0;
+       }
 
-                               chunk_written =
-                                   yaffs_wr_data_obj(cache->object,
-                                                                cache->chunk_id,
-                                                                cache->data,
-                                                                cache->n_bytes,
-                                                                1);
-                               cache->dirty = 0;
-                               cache->object = NULL;
-                       }
+       buffer = (char *)yaffs_get_temp_buffer(dev);
+       if (!buffer)
+               return -ENOMEM;
 
-               } while (cache && chunk_written > 0);
+       result =
+           yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, (u8 *) buffer, &tags);
 
-               if (cache) {
-                       /* Hoosterman, disk full while writing cache out. */
-                       T(YAFFS_TRACE_ERROR,
-                         (TSTR("yaffs tragedy: no space during cache write" TENDSTR)));
+       if (result != YAFFS_OK)
+               retval = -ENOENT;
+       else {
+               x_buffer = buffer + x_offs;
 
+               if (!obj->xattr_known) {
+                       obj->has_xattr = nval_hasvalues(x_buffer, x_size);
+                       obj->xattr_known = 1;
                }
+
+               if (name)
+                       retval = nval_get(x_buffer, x_size, name, value, size);
+               else
+                       retval = nval_list(x_buffer, x_size, value, size);
        }
+       yaffs_release_temp_buffer(dev, (u8 *) buffer);
+       return retval;
+}
 
+int yaffs_set_xattrib(struct yaffs_obj *obj, const YCHAR * name,
+                     const void *value, int size, int flags)
+{
+       return yaffs_do_xattrib_mod(obj, 1, name, value, size, flags);
 }
 
-/*yaffs_flush_whole_cache(dev)
- *
- *
- */
+int yaffs_remove_xattrib(struct yaffs_obj *obj, const YCHAR * name)
+{
+       return yaffs_do_xattrib_mod(obj, 0, name, NULL, 0, 0);
+}
 
-void yaffs_flush_whole_cache(yaffs_dev_t *dev)
+int yaffs_get_xattrib(struct yaffs_obj *obj, const YCHAR * name, void *value,
+                     int size)
 {
-       yaffs_obj_t *obj;
-       int n_caches = dev->param.n_caches;
-       int i;
+       return yaffs_do_xattrib_fetch(obj, name, value, size);
+}
 
-       /* 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;
+int yaffs_list_xattrib(struct yaffs_obj *obj, char *buffer, int size)
+{
+       return yaffs_do_xattrib_fetch(obj, NULL, buffer, size);
+}
 
-               }
-               if (obj)
-                       yaffs_flush_file_cache(obj);
+static void yaffs_check_obj_details_loaded(struct yaffs_obj *in)
+{
+       u8 *buf;
+       struct yaffs_obj_hdr *oh;
+       struct yaffs_dev *dev;
+       struct yaffs_ext_tags tags;
+       int result;
+       int alloc_failed = 0;
 
-       } while (obj);
+       if (!in || !in->lazy_loaded || in->hdr_chunk < 1)
+               return;
 
-}
+       dev = in->my_dev;
+       in->lazy_loaded = 0;
+       buf = yaffs_get_temp_buffer(dev);
 
+       result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, buf, &tags);
+       oh = (struct yaffs_obj_hdr *)buf;
 
-/* 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 yaffs_cache_t *yaffs_grab_chunk_worker(yaffs_dev_t *dev)
-{
-       int i;
+       in->yst_mode = oh->yst_mode;
+       yaffs_load_attribs(in, oh);
+       yaffs_set_obj_name_from_oh(in, oh);
 
-       if (dev->param.n_caches > 0) {
-               for (i = 0; i < dev->param.n_caches; i++) {
-                       if (!dev->cache[i].object)
-                               return &dev->cache[i];
-               }
+       if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) {
+               in->variant.symlink_variant.alias =
+                   yaffs_clone_str(oh->alias);
+               if (!in->variant.symlink_variant.alias)
+                       alloc_failed = 1;       /* Not returned */
        }
-
-       return NULL;
+       yaffs_release_temp_buffer(dev, buf);
 }
 
-static yaffs_cache_t *yaffs_grab_chunk_cache(yaffs_dev_t *dev)
+/* UpdateObjectHeader updates the header on NAND for an object.
+ * If name is not NULL, then that new name is used.
+ */
+int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force,
+                   int is_shrink, int shadows, struct yaffs_xattr_mod *xmod)
 {
-       yaffs_cache_t *cache;
-       yaffs_obj_t *the_obj;
-       int usage;
-       int i;
-       int pushout;
 
-       if (dev->param.n_caches > 0) {
-               /* Try find a non-dirty one... */
+       struct yaffs_block_info *bi;
+       struct yaffs_dev *dev = in->my_dev;
+       int prev_chunk_id;
+       int ret_val = 0;
+       int result = 0;
+       int new_chunk_id;
+       struct yaffs_ext_tags new_tags;
+       struct yaffs_ext_tags old_tags;
+       const YCHAR *alias = NULL;
+       u8 *buffer = NULL;
+       YCHAR old_name[YAFFS_MAX_NAME_LENGTH + 1];
+       struct yaffs_obj_hdr *oh = NULL;
+       loff_t file_size = 0;
 
-               cache = yaffs_grab_chunk_worker(dev);
+       strcpy(old_name, _Y("silly old name"));
 
-               if (!cache) {
-                       /* They were all dirty, find the last recently used object and flush
-                        * its cache, then  find again.
-                        * NB what's here is not very accurate, we actually flush the object
-                        * the last recently used page.
-                        */
+       if (in->fake && in != dev->root_dir && !force && !xmod)
+               return ret_val;
 
-                       /* With locking we can't assume we can use entry zero */
+       yaffs_check_gc(dev, 0);
+       yaffs_check_obj_details_loaded(in);
 
-                       the_obj = NULL;
-                       usage = -1;
-                       cache = NULL;
-                       pushout = -1;
+       buffer = yaffs_get_temp_buffer(in->my_dev);
+       oh = (struct yaffs_obj_hdr *)buffer;
 
-                       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;
-                               }
-                       }
+       prev_chunk_id = in->hdr_chunk;
 
-                       if (!cache || cache->dirty) {
-                               /* Flush and try again */
-                               yaffs_flush_file_cache(the_obj);
-                               cache = yaffs_grab_chunk_worker(dev);
-                       }
+       if (prev_chunk_id > 0) {
+               result = yaffs_rd_chunk_tags_nand(dev, prev_chunk_id,
+                                                 buffer, &old_tags);
 
-               }
-               return cache;
-       } else
-               return NULL;
+               yaffs_verify_oh(in, oh, &old_tags, 0);
+               memcpy(old_name, oh->name, sizeof(oh->name));
+               memset(buffer, 0xff, sizeof(struct yaffs_obj_hdr));
+       } else {
+               memset(buffer, 0xff, dev->data_bytes_per_chunk);
+       }
 
-}
+       oh->type = in->variant_type;
+       oh->yst_mode = in->yst_mode;
+       oh->shadows_obj = oh->inband_shadowed_obj_id = shadows;
 
-/* Find a cached chunk */
-static yaffs_cache_t *yaffs_find_chunk_cache(const yaffs_obj_t *obj,
-                                             int chunk_id)
-{
-       yaffs_dev_t *dev = obj->my_dev;
-       int i;
-       if (dev->param.n_caches > 0) {
-               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++;
+       yaffs_load_attribs_oh(oh, in);
 
-                               return &dev->cache[i];
-                       }
-               }
+       if (in->parent)
+               oh->parent_obj_id = in->parent->obj_id;
+       else
+               oh->parent_obj_id = 0;
+
+       if (name && *name) {
+               memset(oh->name, 0, sizeof(oh->name));
+               yaffs_load_oh_from_name(dev, oh->name, name);
+       } else if (prev_chunk_id > 0) {
+               memcpy(oh->name, old_name, sizeof(oh->name));
+       } else {
+               memset(oh->name, 0, sizeof(oh->name));
        }
-       return NULL;
-}
 
-/* Mark the chunk for the least recently used algorithym */
-static void yaffs_use_cache(yaffs_dev_t *dev, yaffs_cache_t *cache,
-                               int is_write)
-{
+       oh->is_shrink = is_shrink;
 
-       if (dev->param.n_caches > 0) {
-               if (dev->cache_last_use < 0 || dev->cache_last_use > 100000000) {
-                       /* Reset the cache usages */
-                       int i;
-                       for (i = 1; i < dev->param.n_caches; i++)
-                               dev->cache[i].last_use = 0;
+       switch (in->variant_type) {
+       case YAFFS_OBJECT_TYPE_UNKNOWN:
+               /* Should not happen */
+               break;
+       case YAFFS_OBJECT_TYPE_FILE:
+               if (oh->parent_obj_id != YAFFS_OBJECTID_DELETED &&
+                   oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED)
+                       file_size = in->variant.file_variant.file_size;
+               yaffs_oh_size_load(oh, file_size);
+               break;
+       case YAFFS_OBJECT_TYPE_HARDLINK:
+               oh->equiv_id = in->variant.hardlink_variant.equiv_id;
+               break;
+       case YAFFS_OBJECT_TYPE_SPECIAL:
+               /* Do nothing */
+               break;
+       case YAFFS_OBJECT_TYPE_DIRECTORY:
+               /* Do nothing */
+               break;
+       case YAFFS_OBJECT_TYPE_SYMLINK:
+               alias = in->variant.symlink_variant.alias;
+               if (!alias)
+                       alias = _Y("no alias");
+               strncpy(oh->alias, alias, YAFFS_MAX_ALIAS_LENGTH);
+               oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0;
+               break;
+       }
 
-                       dev->cache_last_use = 0;
-               }
+       /* process any xattrib modifications */
+       if (xmod)
+               yaffs_apply_xattrib_mod(in, (char *)buffer, xmod);
 
-               dev->cache_last_use++;
+       /* Tags */
+       memset(&new_tags, 0, sizeof(new_tags));
+       in->serial++;
+       new_tags.chunk_id = 0;
+       new_tags.obj_id = in->obj_id;
+       new_tags.serial_number = in->serial;
+
+       /* Add extra info for file header */
+       new_tags.extra_available = 1;
+       new_tags.extra_parent_id = oh->parent_obj_id;
+       new_tags.extra_file_size = file_size;
+       new_tags.extra_is_shrink = oh->is_shrink;
+       new_tags.extra_equiv_id = oh->equiv_id;
+       new_tags.extra_shadows = (oh->shadows_obj > 0) ? 1 : 0;
+       new_tags.extra_obj_type = in->variant_type;
+       yaffs_verify_oh(in, oh, &new_tags, 1);
+
+       /* Create new chunk in NAND */
+       new_chunk_id =
+           yaffs_write_new_chunk(dev, buffer, &new_tags,
+                                 (prev_chunk_id > 0) ? 1 : 0);
 
-               cache->last_use = dev->cache_last_use;
+       if (buffer)
+               yaffs_release_temp_buffer(dev, buffer);
 
-               if (is_write)
-                       cache->dirty = 1;
-       }
-}
+       if (new_chunk_id < 0)
+               return new_chunk_id;
 
-/* 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(yaffs_obj_t *object, int chunk_id)
-{
-       if (object->my_dev->param.n_caches > 0) {
-               yaffs_cache_t *cache = yaffs_find_chunk_cache(object, chunk_id);
+       in->hdr_chunk = new_chunk_id;
 
-               if (cache)
-                       cache->object = NULL;
-       }
-}
+       if (prev_chunk_id > 0)
+               yaffs_chunk_del(dev, prev_chunk_id, 1, __LINE__);
 
-/* Invalidate all the cache pages associated with this object
- * Do this whenever ther file is deleted or resized.
- */
-static void yaffs_invalidate_whole_cache(yaffs_obj_t *in)
-{
-       int i;
-       yaffs_dev_t *dev = in->my_dev;
+       if (!yaffs_obj_cache_dirty(in))
+               in->dirty = 0;
 
-       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;
-               }
+       /* If this was a shrink, then mark the block
+        * that the chunk lives on */
+       if (is_shrink) {
+               bi = yaffs_get_block_info(in->my_dev,
+                                         new_chunk_id /
+                                         in->my_dev->param.chunks_per_block);
+               bi->has_shrink_hdr = 1;
        }
-}
 
 
+       return new_chunk_id;
+}
+
 /*--------------------- File read/write ------------------------
  * Read and write have very similar structures.
  * In general the read/write has three parts to it
@@ -3434,24 +3403,19 @@ static void yaffs_invalidate_whole_cache(yaffs_obj_t *in)
  * Curve-balls: the first chunk might also be the last chunk.
  */
 
-int yaffs_file_rd(yaffs_obj_t *in, __u8 *buffer, loff_t offset,
-                       int n_bytes)
+int yaffs_file_rd(struct yaffs_obj *in, u8 * buffer, loff_t offset, int n_bytes)
 {
-
        int chunk;
-       __u32 start;
+       u32 start;
        int n_copy;
        int n = n_bytes;
        int n_done = 0;
-       yaffs_cache_t *cache;
-
-       yaffs_dev_t *dev;
+       struct yaffs_cache *cache;
+       struct yaffs_dev *dev;
 
        dev = in->my_dev;
 
        while (n > 0) {
-               /* chunk = offset / dev->data_bytes_per_chunk + 1; */
-               /* start = offset % dev->data_bytes_per_chunk; */
                yaffs_addr_to_chunk(dev, offset, &chunk, &start);
                chunk++;
 
@@ -3465,24 +3429,26 @@ int yaffs_file_rd(yaffs_obj_t *in, __u8 *buffer, loff_t offset,
 
                cache = yaffs_find_chunk_cache(in, chunk);
 
-               /* If the chunk is already in the cache or it is less than a whole chunk
-                * or we're using inband tags then use the cache (if there is caching)
-                * else bypass the cache.
+               /* If the chunk is already in the cache or it is less than
+                * a whole chunk or we're using inband tags then use the cache
+                * (if there is caching) else bypass the cache.
                 */
-               if (cache || n_copy != dev->data_bytes_per_chunk || dev->param.inband_tags) {
+               if (cache || n_copy != dev->data_bytes_per_chunk ||
+                   dev->param.inband_tags) {
                        if (dev->param.n_caches > 0) {
 
-                               /* If we can't find the data in the cache, then load it up. */
+                               /* If we can't find the data in the cache,
+                                * then load it up. */
 
                                if (!cache) {
-                                       cache = yaffs_grab_chunk_cache(in->my_dev);
+                                       cache =
+                                           yaffs_grab_chunk_cache(in->my_dev);
                                        cache->object = in;
                                        cache->chunk_id = chunk;
                                        cache->dirty = 0;
                                        cache->locked = 0;
                                        yaffs_rd_data_obj(in, chunk,
-                                                                     cache->
-                                                                     data);
+                                                         cache->data);
                                        cache->n_bytes = 0;
                                }
 
@@ -3490,72 +3456,61 @@ int yaffs_file_rd(yaffs_obj_t *in, __u8 *buffer, loff_t offset,
 
                                cache->locked = 1;
 
-
                                memcpy(buffer, &cache->data[start], n_copy);
 
                                cache->locked = 0;
                        } else {
-                               /* Read into the local buffer then copy..*/
+                               /* Read into the local buffer then copy.. */
 
-                               __u8 *local_buffer =
-                                   yaffs_get_temp_buffer(dev, __LINE__);
-                               yaffs_rd_data_obj(in, chunk,
-                                                             local_buffer);
+                               u8 *local_buffer =
+                                   yaffs_get_temp_buffer(dev);
+                               yaffs_rd_data_obj(in, chunk, local_buffer);
 
                                memcpy(buffer, &local_buffer[start], n_copy);
 
-
-                               yaffs_release_temp_buffer(dev, local_buffer,
-                                                       __LINE__);
+                               yaffs_release_temp_buffer(dev, local_buffer);
                        }
-
                } else {
-
-                       /* A full chunk. Read directly into the supplied buffer. */
+                       /* A full chunk. Read directly into the buffer. */
                        yaffs_rd_data_obj(in, chunk, buffer);
-
                }
-
                n -= n_copy;
                offset += n_copy;
                buffer += n_copy;
                n_done += n_copy;
-
        }
-
        return n_done;
 }
 
-int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset,
-                       int n_bytes, int write_trhrough)
+int yaffs_do_file_wr(struct yaffs_obj *in, const u8 *buffer, loff_t offset,
+                    int n_bytes, int write_through)
 {
 
        int chunk;
-       __u32 start;
+       u32 start;
        int n_copy;
        int n = n_bytes;
        int n_done = 0;
        int n_writeback;
-       int start_write = offset;
+       loff_t start_write = offset;
        int chunk_written = 0;
-       __u32 n_bytes_read;
-       __u32 chunk_start;
-
-       yaffs_dev_t *dev;
+       u32 n_bytes_read;
+       loff_t chunk_start;
+       struct yaffs_dev *dev;
 
        dev = in->my_dev;
 
        while (n > 0 && chunk_written >= 0) {
                yaffs_addr_to_chunk(dev, offset, &chunk, &start);
 
-               if (chunk * dev->data_bytes_per_chunk + start != offset ||
-                               start >= dev->data_bytes_per_chunk) {
-                       T(YAFFS_TRACE_ERROR, (
-                          TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-                          TENDSTR),
-                          (int)offset, chunk, start));
+               if (((loff_t)chunk) *
+                   dev->data_bytes_per_chunk + start != offset ||
+                   start >= dev->data_bytes_per_chunk) {
+                       yaffs_trace(YAFFS_TRACE_ERROR,
+                               "AddrToChunk of offset %lld gives chunk %d start %d",
+                               offset, chunk, start);
                }
-               chunk++; /* File pos to chunk in file offset */
+               chunk++;        /* File pos to chunk in file offset */
 
                /* OK now check for the curveball where the start and end are in
                 * the same chunk.
@@ -3564,17 +3519,21 @@ int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset,
                if ((start + n) < dev->data_bytes_per_chunk) {
                        n_copy = n;
 
-                       /* Now folks, to calculate how many bytes to write back....
-                        * If we're overwriting and not writing to then end of file then
-                        * we need to write back as much as was there before.
+                       /* Now calculate how many bytes to write back....
+                        * If we're overwriting and not writing to then end of
+                        * file then we need to write back as much as was there
+                        * before.
                         */
 
-                       chunk_start = ((chunk - 1) * dev->data_bytes_per_chunk);
+                       chunk_start = (((loff_t)(chunk - 1)) *
+                                       dev->data_bytes_per_chunk);
 
                        if (chunk_start > in->variant.file_variant.file_size)
-                               n_bytes_read = 0; /* Past end of file */
+                               n_bytes_read = 0;       /* Past end of file */
                        else
-                               n_bytes_read = in->variant.file_variant.file_size - chunk_start;
+                               n_bytes_read =
+                                   in->variant.file_variant.file_size -
+                                   chunk_start;
 
                        if (n_bytes_read > dev->data_bytes_per_chunk)
                                n_bytes_read = dev->data_bytes_per_chunk;
@@ -3583,103 +3542,99 @@ int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset,
                            (n_bytes_read >
                             (start + n)) ? n_bytes_read : (start + n);
 
-                       if (n_writeback < 0 || n_writeback > dev->data_bytes_per_chunk)
-                               YBUG();
+                       if (n_writeback < 0 ||
+                           n_writeback > dev->data_bytes_per_chunk)
+                               BUG();
 
                } else {
                        n_copy = dev->data_bytes_per_chunk - start;
                        n_writeback = dev->data_bytes_per_chunk;
                }
 
-               if (n_copy != dev->data_bytes_per_chunk || dev->param.inband_tags) {
-                       /* An incomplete start or end chunk (or maybe both start and end chunk),
-                        * or we're using inband tags, so we want to use the cache buffers.
+               if (n_copy != dev->data_bytes_per_chunk ||
+                   !dev->param.cache_bypass_aligned ||
+                   dev->param.inband_tags) {
+                       /* An incomplete start or end chunk (or maybe both
+                        * start and end chunk), or we're using inband tags,
+                        * or we're forcing writes through the cache,
+                        * so we want to use the cache buffers.
                         */
                        if (dev->param.n_caches > 0) {
-                               yaffs_cache_t *cache;
-                               /* If we can't find the data in the cache, then load the cache */
+                               struct yaffs_cache *cache;
+
+                               /* If we can't find the data in the cache, then
+                                * load the cache */
                                cache = yaffs_find_chunk_cache(in, chunk);
 
-                               if (!cache
-                                   && yaffs_check_alloc_available(dev, 1)) {
+                               if (!cache &&
+                                   yaffs_check_alloc_available(dev, 1)) {
                                        cache = yaffs_grab_chunk_cache(dev);
                                        cache->object = in;
                                        cache->chunk_id = chunk;
                                        cache->dirty = 0;
                                        cache->locked = 0;
                                        yaffs_rd_data_obj(in, chunk,
-                                                                     cache->data);
+                                                         cache->data);
                                } else if (cache &&
-                                       !cache->dirty &&
-                                       !yaffs_check_alloc_available(dev, 1)) {
-                                       /* Drop the cache if it was a read cache item and
-                                        * no space check has been made for it.
+                                          !cache->dirty &&
+                                          !yaffs_check_alloc_available(dev,
+                                                                       1)) {
+                                       /* Drop the cache if it was a read cache
+                                        * item and no space check has been made
+                                        * for it.
                                         */
-                                        cache = NULL;
+                                       cache = NULL;
                                }
 
                                if (cache) {
                                        yaffs_use_cache(dev, cache, 1);
                                        cache->locked = 1;
 
-
                                        memcpy(&cache->data[start], buffer,
                                               n_copy);
 
-
                                        cache->locked = 0;
                                        cache->n_bytes = n_writeback;
 
-                                       if (write_trhrough) {
+                                       if (write_through) {
                                                chunk_written =
                                                    yaffs_wr_data_obj
                                                    (cache->object,
                                                     cache->chunk_id,
-                                                    cache->data, cache->n_bytes,
-                                                    1);
+                                                    cache->data,
+                                                    cache->n_bytes, 1);
                                                cache->dirty = 0;
                                        }
-
                                } else {
-                                       chunk_written = -1;     /* fail the write */
+                                       chunk_written = -1;     /* fail write */
                                }
                        } else {
-                               /* An incomplete start or end chunk (or maybe both start and end chunk)
-                                * Read into the local buffer then copy, then copy over and write back.
+                               /* An incomplete start or end chunk (or maybe
+                                * both start and end chunk). Read into the
+                                * local buffer then copy over and write back.
                                 */
 
-                               __u8 *local_buffer =
-                                   yaffs_get_temp_buffer(dev, __LINE__);
-
-                               yaffs_rd_data_obj(in, chunk,
-                                                             local_buffer);
-
-
+                               u8 *local_buffer = yaffs_get_temp_buffer(dev);
 
+                               yaffs_rd_data_obj(in, chunk, local_buffer);
                                memcpy(&local_buffer[start], buffer, n_copy);
 
                                chunk_written =
                                    yaffs_wr_data_obj(in, chunk,
-                                                                local_buffer,
-                                                                n_writeback,
-                                                                0);
-
-                               yaffs_release_temp_buffer(dev, local_buffer,
-                                                       __LINE__);
+                                                     local_buffer,
+                                                     n_writeback, 0);
 
+                               yaffs_release_temp_buffer(dev, local_buffer);
                        }
-
                } else {
-                       /* A full chunk. Write directly from the supplied buffer. */
-
-
+                       /* A full chunk. Write directly from the buffer. */
 
                        chunk_written =
                            yaffs_wr_data_obj(in, chunk, buffer,
-                                                        dev->data_bytes_per_chunk,
-                                                        0);
+                                             dev->data_bytes_per_chunk, 0);
 
-                       /* Since we've overwritten the cached data, we better invalidate it. */
+                       /* Since we've overwritten the cached data,
+                        * we better invalidate it. */
                        yaffs_invalidate_chunk_cache(in, chunk);
                }
 
@@ -3689,7 +3644,6 @@ int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset,
                        buffer += n_copy;
                        n_done += n_copy;
                }
-
        }
 
        /* Update file object */
@@ -3698,33 +3652,38 @@ int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset,
                in->variant.file_variant.file_size = (start_write + n_done);
 
        in->dirty = 1;
-
        return n_done;
 }
 
-int yaffs_wr_file(yaffs_obj_t *in, const __u8 *buffer, loff_t offset,
-                       int n_bytes, int write_trhrough)
+int yaffs_wr_file(struct yaffs_obj *in, const u8 *buffer, loff_t offset,
+                 int n_bytes, int write_through)
 {
-       yaffs2_handle_hole(in,offset);
-       return yaffs_do_file_wr(in,buffer,offset,n_bytes,write_trhrough);
+       yaffs2_handle_hole(in, offset);
+       return yaffs_do_file_wr(in, buffer, offset, n_bytes, write_through);
 }
 
-
-
 /* ---------------------- File resizing stuff ------------------ */
 
-static void yaffs_prune_chunks(yaffs_obj_t *in, int new_size)
+static void yaffs_prune_chunks(struct yaffs_obj *in, loff_t new_size)
 {
 
-       yaffs_dev_t *dev = in->my_dev;
-       int old_size = in->variant.file_variant.file_size;
-
-       int last_del = 1 + (old_size - 1) / dev->data_bytes_per_chunk;
-
-       int start_del = 1 + (new_size + dev->data_bytes_per_chunk - 1) /
-           dev->data_bytes_per_chunk;
+       struct yaffs_dev *dev = in->my_dev;
+       loff_t old_size = in->variant.file_variant.file_size;
        int i;
        int chunk_id;
+       u32 dummy;
+       int last_del;
+       int start_del;
+
+       if (old_size > 0)
+               yaffs_addr_to_chunk(dev, old_size - 1, &last_del, &dummy);
+       else
+               last_del = 0;
+
+       yaffs_addr_to_chunk(dev, new_size + dev->data_bytes_per_chunk - 1,
+                               &start_del, &dummy);
+       last_del++;
+       start_del++;
 
        /* Delete backwards so that we don't end up with holes if
         * power is lost part-way through the operation.
@@ -3736,30 +3695,30 @@ static void yaffs_prune_chunks(yaffs_obj_t *in, int new_size)
                 */
 
                chunk_id = yaffs_find_del_file_chunk(in, i, NULL);
-               if (chunk_id > 0) {
-                       if (chunk_id <
-                           (dev->internal_start_block * dev->param.chunks_per_block)
-                           || chunk_id >=
-                           ((dev->internal_end_block +
-                             1) * dev->param.chunks_per_block)) {
-                               T(YAFFS_TRACE_ALWAYS,
-                                 (TSTR("Found daft chunk_id %d for %d" TENDSTR),
-                                  chunk_id, i));
-                       } else {
-                               in->n_data_chunks--;
-                               yaffs_chunk_del(dev, chunk_id, 1, __LINE__);
-                       }
+
+               if (chunk_id < 1)
+                       continue;
+
+               if (chunk_id <
+                   (dev->internal_start_block * dev->param.chunks_per_block) ||
+                   chunk_id >=
+                   ((dev->internal_end_block + 1) *
+                     dev->param.chunks_per_block)) {
+                       yaffs_trace(YAFFS_TRACE_ALWAYS,
+                               "Found daft chunk_id %d for %d",
+                               chunk_id, i);
+               } else {
+                       in->n_data_chunks--;
+                       yaffs_chunk_del(dev, chunk_id, 1, __LINE__);
                }
        }
-
 }
 
-
-void yaffs_resize_file_down( yaffs_obj_t *obj, loff_t new_size)
+void yaffs_resize_file_down(struct yaffs_obj *obj, loff_t new_size)
 {
        int new_full;
-       __u32 new_partial;
-       yaffs_dev_t *dev = obj->my_dev;
+       u32 new_partial;
+       struct yaffs_dev *dev = obj->my_dev;
 
        yaffs_addr_to_chunk(dev, new_size, &new_full, &new_partial);
 
@@ -3767,17 +3726,17 @@ void yaffs_resize_file_down( yaffs_obj_t *obj, loff_t new_size)
 
        if (new_partial != 0) {
                int last_chunk = 1 + new_full;
-               __u8 *local_buffer = yaffs_get_temp_buffer(dev, __LINE__);
+               u8 *local_buffer = yaffs_get_temp_buffer(dev);
 
-               /* Got to read and rewrite the last chunk with its new size and zero pad */
+               /* Rewrite the last chunk with its new size and zero pad */
                yaffs_rd_data_obj(obj, last_chunk, local_buffer);
                memset(local_buffer + new_partial, 0,
-                       dev->data_bytes_per_chunk - new_partial);
+                      dev->data_bytes_per_chunk - new_partial);
 
                yaffs_wr_data_obj(obj, last_chunk, local_buffer,
-                                            new_partial, 1);
+                                 new_partial, 1);
 
-               yaffs_release_temp_buffer(dev, local_buffer, __LINE__);
+               yaffs_release_temp_buffer(dev, local_buffer);
        }
 
        obj->variant.file_variant.file_size = new_size;
@@ -3785,126 +3744,74 @@ void yaffs_resize_file_down( yaffs_obj_t *obj, loff_t new_size)
        yaffs_prune_tree(dev, &obj->variant.file_variant);
 }
 
-
-int yaffs_resize_file(yaffs_obj_t *in, loff_t new_size)
+int yaffs_resize_file(struct yaffs_obj *in, loff_t new_size)
 {
-       yaffs_dev_t *dev = in->my_dev;
-       int old_size = in->variant.file_variant.file_size;
+       struct yaffs_dev *dev = in->my_dev;
+       loff_t old_size = in->variant.file_variant.file_size;
 
-       yaffs_flush_file_cache(in);
+       yaffs_flush_file_cache(in, 1);
        yaffs_invalidate_whole_cache(in);
 
-       yaffs_check_gc(dev,0);
+       yaffs_check_gc(dev, 0);
 
        if (in->variant_type != YAFFS_OBJECT_TYPE_FILE)
                return YAFFS_FAIL;
 
        if (new_size == old_size)
                return YAFFS_OK;
-               
-       if(new_size > old_size){
-               yaffs2_handle_hole(in,new_size);
+
+       if (new_size > old_size) {
+               yaffs2_handle_hole(in, new_size);
                in->variant.file_variant.file_size = new_size;
        } else {
-               /* new_size < old_size */ 
+               /* new_size < old_size */
                yaffs_resize_file_down(in, new_size);
-       } 
+       }
 
        /* Write a new object header to reflect the resize.
         * show we've shrunk the file, if need be
-        * Do this only if the file is not in the deleted directories
-        * and is not shadowed.
-        */
-       if (in->parent &&
-           !in->is_shadowed &&
-           in->parent->obj_id != YAFFS_OBJECTID_UNLINKED &&
-           in->parent->obj_id != YAFFS_OBJECTID_DELETED)
-               yaffs_update_oh(in, NULL, 0, 0, 0, NULL);
-
-
-       return YAFFS_OK;
-}
-
-loff_t yaffs_get_file_size(yaffs_obj_t *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 yaffs_strnlen(alias,YAFFS_MAX_ALIAS_LENGTH);
-       default:
-               return 0;
-       }
-}
-
-
-
-int yaffs_flush_file(yaffs_obj_t *in, int update_time, int data_sync)
-{
-       int ret_val;
-       if (in->dirty) {
-               yaffs_flush_file_cache(in);
-               if(data_sync) /* Only sync data */
-                       ret_val=YAFFS_OK;
-               else {
-                       if (update_time) {
-#ifdef CONFIG_YAFFS_WINCE
-                               yfsd_win_file_time_now(in->win_mtime);
-#else
-
-                               in->yst_mtime = Y_CURRENT_TIME;
-
-#endif
-                       }
-
-                       ret_val = (yaffs_update_oh(in, NULL, 0, 0, 0, NULL) >=
-                               0) ? YAFFS_OK : YAFFS_FAIL;
-               }
-       } else {
-               ret_val = YAFFS_OK;
-       }
-
-       return ret_val;
+        * Do this only if the file is not in the deleted directories
+        * and is not shadowed.
+        */
+       if (in->parent &&
+           !in->is_shadowed &&
+           in->parent->obj_id != YAFFS_OBJECTID_UNLINKED &&
+           in->parent->obj_id != YAFFS_OBJECTID_DELETED)
+               yaffs_update_oh(in, NULL, 0, 0, 0, NULL);
 
+       return YAFFS_OK;
 }
 
-static int yaffs_generic_obj_del(yaffs_obj_t *in)
+int yaffs_flush_file(struct yaffs_obj *in,
+                    int update_time,
+                    int data_sync,
+                    int discard_cache)
 {
+       if (!in->dirty)
+               return YAFFS_OK;
 
-       /* First off, invalidate 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 the unlinked directory so we have a record that it was deleted. */
-               yaffs_change_obj_name(in, in->my_dev->del_dir, _Y("deleted"), 0, 0);
-
-       }
+       yaffs_flush_file_cache(in, discard_cache);
 
-       yaffs_remove_obj_from_dir(in);
-       yaffs_chunk_del(in->my_dev, in->hdr_chunk, 1, __LINE__);
-       in->hdr_chunk = 0;
+       if (data_sync)
+               return YAFFS_OK;
 
-       yaffs_free_obj(in);
-       return YAFFS_OK;
+       if (update_time)
+               yaffs_load_current_time(in, 0, 0);
 
+       return (yaffs_update_oh(in, NULL, 0, 0, 0, NULL) >= 0) ?
+                               YAFFS_OK : YAFFS_FAIL;
 }
 
+
 /* yaffs_del_file deletes the whole file data
  * and the inode associated with the file.
  * It does not delete the links associated with the file.
  */
-static int yaffs_unlink_file_if_needed(yaffs_obj_t *in)
+static int yaffs_unlink_file_if_needed(struct yaffs_obj *in)
 {
-
        int ret_val;
        int del_now = 0;
-       yaffs_dev_t *dev = in->my_dev;
+       struct yaffs_dev *dev = in->my_dev;
 
        if (!in->my_inode)
                del_now = 1;
@@ -3912,10 +3819,10 @@ static int yaffs_unlink_file_if_needed(yaffs_obj_t *in)
        if (del_now) {
                ret_val =
                    yaffs_change_obj_name(in, in->my_dev->del_dir,
-                                          _Y("deleted"), 0, 0);
-               T(YAFFS_TRACE_TRACING,
-                 (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-                  in->obj_id));
+                                         _Y("deleted"), 0, 0);
+               yaffs_trace(YAFFS_TRACE_TRACING,
+                       "yaffs: immediate deletion of file %d",
+                       in->obj_id);
                in->deleted = 1;
                in->my_dev->n_deleted_files++;
                if (dev->param.disable_soft_del || dev->param.is_yaffs2)
@@ -3924,18 +3831,16 @@ static int yaffs_unlink_file_if_needed(yaffs_obj_t *in)
        } else {
                ret_val =
                    yaffs_change_obj_name(in, in->my_dev->unlinked_dir,
-                                          _Y("unlinked"), 0, 0);
+                                         _Y("unlinked"), 0, 0);
        }
-
-
        return ret_val;
 }
 
-int yaffs_del_file(yaffs_obj_t *in)
+static int yaffs_del_file(struct yaffs_obj *in)
 {
        int ret_val = YAFFS_OK;
-       int deleted; /* Need to cache value on stack if in is freed */
-       yaffs_dev_t *dev = in->my_dev;
+       int deleted;    /* Need to cache value on stack if in is freed */
+       struct yaffs_dev *dev = in->my_dev;
 
        if (dev->param.disable_soft_del || dev->param.is_yaffs2)
                yaffs_resize_file(in, 0);
@@ -3966,13 +3871,14 @@ int yaffs_del_file(yaffs_obj_t *in)
        }
 }
 
-static int yaffs_is_non_empty_dir(yaffs_obj_t *obj)
+int yaffs_is_non_empty_dir(struct yaffs_obj *obj)
 {
-       return (obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) &&
-               !(ylist_empty(&obj->variant.dir_variant.children));
+       return (obj &&
+               obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) &&
+               !(list_empty(&obj->variant.dir_variant.children));
 }
 
-static int yaffs_del_dir(yaffs_obj_t *obj)
+static int yaffs_del_dir(struct yaffs_obj *obj)
 {
        /* First check that the directory is empty. */
        if (yaffs_is_non_empty_dir(obj))
@@ -3981,35 +3887,37 @@ static int yaffs_del_dir(yaffs_obj_t *obj)
        return yaffs_generic_obj_del(obj);
 }
 
-static int yaffs_del_symlink(yaffs_obj_t *in)
+static int yaffs_del_symlink(struct yaffs_obj *in)
 {
-       if(in->variant.symlink_variant.alias)
-               YFREE(in->variant.symlink_variant.alias);
-       in->variant.symlink_variant.alias=NULL;
+       kfree(in->variant.symlink_variant.alias);
+       in->variant.symlink_variant.alias = NULL;
 
        return yaffs_generic_obj_del(in);
 }
 
-static int yaffs_del_link(yaffs_obj_t *in)
+static int yaffs_del_link(struct yaffs_obj *in)
 {
-       /* remove this hardlink from the list assocaited with the equivalent
+       /* remove this hardlink from the list associated with the equivalent
         * object
         */
-       ylist_del_init(&in->hard_links);
+       list_del_init(&in->hard_links);
        return yaffs_generic_obj_del(in);
 }
 
-int yaffs_del_obj(yaffs_obj_t *obj)
+int yaffs_del_obj(struct yaffs_obj *obj)
 {
-int ret_val = -1;
+       int ret_val = -1;
+
        switch (obj->variant_type) {
        case YAFFS_OBJECT_TYPE_FILE:
                ret_val = yaffs_del_file(obj);
                break;
        case YAFFS_OBJECT_TYPE_DIRECTORY:
-               if(!ylist_empty(&obj->variant.dir_variant.dirty)){
-                       T(YAFFS_TRACE_BACKGROUND, (TSTR("Remove object %d from dirty directories" TENDSTR),obj->obj_id));
-                       ylist_del_init(&obj->variant.dir_variant.dirty);
+               if (!list_empty(&obj->variant.dir_variant.dirty)) {
+                       yaffs_trace(YAFFS_TRACE_BACKGROUND,
+                               "Remove object %d from dirty directories",
+                               obj->obj_id);
+                       list_del_init(&obj->variant.dir_variant.dirty);
                }
                return yaffs_del_dir(obj);
                break;
@@ -4026,24 +3934,88 @@ int ret_val = -1;
                ret_val = 0;
                break;          /* should not happen. */
        }
-
        return ret_val;
 }
 
-static int yaffs_unlink_worker(yaffs_obj_t *obj)
+
+static void yaffs_empty_dir_to_dir(struct yaffs_obj *from_dir,
+                                  struct yaffs_obj *to_dir)
+{
+       struct yaffs_obj *obj;
+       struct list_head *lh;
+       struct list_head *n;
+
+       list_for_each_safe(lh, n, &from_dir->variant.dir_variant.children) {
+               obj = list_entry(lh, struct yaffs_obj, siblings);
+               yaffs_add_obj_to_dir(to_dir, obj);
+       }
+}
+
+struct yaffs_obj *yaffs_retype_obj(struct yaffs_obj *obj,
+                                  enum yaffs_obj_type type)
 {
+       /* Tear down the old variant */
+       switch (obj->variant_type) {
+       case YAFFS_OBJECT_TYPE_FILE:
+               /* Nuke file data */
+               yaffs_resize_file(obj, 0);
+               yaffs_free_tnode(obj->my_dev, obj->variant.file_variant.top);
+               obj->variant.file_variant.top = NULL;
+               break;
+       case YAFFS_OBJECT_TYPE_DIRECTORY:
+               /* Put the children in lost and found. */
+               yaffs_empty_dir_to_dir(obj, obj->my_dev->lost_n_found);
+               if (!list_empty(&obj->variant.dir_variant.dirty))
+                       list_del_init(&obj->variant.dir_variant.dirty);
+               break;
+       case YAFFS_OBJECT_TYPE_SYMLINK:
+               /* Nuke symplink data */
+               kfree(obj->variant.symlink_variant.alias);
+               obj->variant.symlink_variant.alias = NULL;
+               break;
+       case YAFFS_OBJECT_TYPE_HARDLINK:
+               list_del_init(&obj->hard_links);
+               break;
+       default:
+               break;
+       }
+
+       memset(&obj->variant, 0, sizeof(obj->variant));
+
+       /*Set up new variant if the memset is not enough. */
+       switch (type) {
+       case YAFFS_OBJECT_TYPE_DIRECTORY:
+               INIT_LIST_HEAD(&obj->variant.dir_variant.children);
+               INIT_LIST_HEAD(&obj->variant.dir_variant.dirty);
+               break;
+       case YAFFS_OBJECT_TYPE_FILE:
+       case YAFFS_OBJECT_TYPE_SYMLINK:
+       case YAFFS_OBJECT_TYPE_HARDLINK:
+       default:
+               break;
+       }
+
+       obj->variant_type = type;
 
+       return obj;
+
+}
+
+static int yaffs_unlink_worker(struct yaffs_obj *obj)
+{
        int del_now = 0;
 
+       if (!obj)
+               return YAFFS_FAIL;
+
        if (!obj->my_inode)
                del_now = 1;
 
-       if(obj)
-               yaffs_update_parent(obj->parent);
+       yaffs_update_parent(obj->parent);
 
        if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) {
                return yaffs_del_link(obj);
-       } else if (!ylist_empty(&obj->hard_links)) {
+       } else if (!list_empty(&obj->hard_links)) {
                /* Curve ball: We're unlinking an object that has a hardlink.
                 *
                 * This problem arises because we are not strictly following
@@ -4053,26 +4025,27 @@ static int yaffs_unlink_worker(yaffs_obj_t *obj)
                 * Instead, we do the following:
                 * - Select a hardlink.
                 * - Unhook it from the hard links
-                * - Move it from its parent directory (so that the rename can work)
+                * - Move it from its parent directory so that the rename works.
                 * - Rename the object to the hardlink's name.
                 * - Delete the hardlink
                 */
 
-               yaffs_obj_t *hl;
-               yaffs_obj_t *parent;
+               struct yaffs_obj *hl;
+               struct yaffs_obj *parent;
                int ret_val;
                YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
 
-               hl = ylist_entry(obj->hard_links.next, yaffs_obj_t, hard_links);
+               hl = list_entry(obj->hard_links.next, struct yaffs_obj,
+                               hard_links);
 
                yaffs_get_obj_name(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
                parent = hl->parent;
 
-               ylist_del_init(&hl->hard_links);
+               list_del_init(&hl->hard_links);
 
-               yaffs_add_obj_to_dir(obj->my_dev->unlinked_dir, hl);
+               yaffs_add_obj_to_dir(obj->my_dev->unlinked_dir, hl);
 
-               ret_val = yaffs_change_obj_name(obj,parent, name, 0, 0);
+               ret_val = yaffs_change_obj_name(obj, parent, name, 0, 0);
 
                if (ret_val == YAFFS_OK)
                        ret_val = yaffs_generic_obj_del(hl);
@@ -4085,7 +4058,7 @@ static int yaffs_unlink_worker(yaffs_obj_t *obj)
                        return yaffs_del_file(obj);
                        break;
                case YAFFS_OBJECT_TYPE_DIRECTORY:
-                       ylist_del_init(&obj->variant.dir_variant.dirty);
+                       list_del_init(&obj->variant.dir_variant.dirty);
                        return yaffs_del_dir(obj);
                        break;
                case YAFFS_OBJECT_TYPE_SYMLINK:
@@ -4099,126 +4072,187 @@ static int yaffs_unlink_worker(yaffs_obj_t *obj)
                default:
                        return YAFFS_FAIL;
                }
-       } else if(yaffs_is_non_empty_dir(obj))
+       } else if (yaffs_is_non_empty_dir(obj)) {
                return YAFFS_FAIL;
-       else
+       } else {
                return yaffs_change_obj_name(obj, obj->my_dev->unlinked_dir,
-                                          _Y("unlinked"), 0, 0);
+                                               _Y("unlinked"), 0, 0);
+       }
 }
 
-
-static int yaffs_unlink_obj(yaffs_obj_t *obj)
+int yaffs_unlink_obj(struct yaffs_obj *obj)
 {
-
        if (obj && obj->unlink_allowed)
                return yaffs_unlink_worker(obj);
 
        return YAFFS_FAIL;
-
 }
-int yaffs_unlinker(yaffs_obj_t *dir, const YCHAR *name)
+
+int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR *name)
 {
-       yaffs_obj_t *obj;
+       struct yaffs_obj *obj;
 
        obj = yaffs_find_by_name(dir, name);
        return yaffs_unlink_obj(obj);
 }
 
+/* Note:
+ * If old_name is NULL then we take old_dir as the object to be renamed.
+ */
+int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR *old_name,
+                    struct yaffs_obj *new_dir, const YCHAR *new_name)
+{
+       struct yaffs_obj *obj = NULL;
+       struct yaffs_obj *existing_target = NULL;
+       int force = 0;
+       int result;
+       struct yaffs_dev *dev;
+
+       if (!old_dir || old_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               BUG();
+               return YAFFS_FAIL;
+       }
+       if (!new_dir || new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               BUG();
+               return YAFFS_FAIL;
+       }
+
+       dev = old_dir->my_dev;
+
+#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
+       /* Special case for case insemsitive systems.
+        * 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 &&
+               old_name && new_name &&
+               strcmp(old_name, new_name) == 0)
+               force = 1;
+#endif
+
+       if (strnlen(new_name, YAFFS_MAX_NAME_LENGTH + 1) >
+           YAFFS_MAX_NAME_LENGTH)
+               /* ENAMETOOLONG */
+               return YAFFS_FAIL;
+
+       if (old_name)
+               obj = yaffs_find_by_name(old_dir, old_name);
+       else{
+               obj = old_dir;
+               old_dir = obj->parent;
+       }
+
+       if (obj && obj->rename_allowed) {
+               /* Now handle an existing target, if there is one */
+               existing_target = yaffs_find_by_name(new_dir, new_name);
+               if (yaffs_is_non_empty_dir(existing_target)) {
+                       return YAFFS_FAIL;      /* ENOTEMPTY */
+               } else if (existing_target && existing_target != obj) {
+                       /* Nuke the target first, using shadowing,
+                        * but only if it isn't the same object.
+                        *
+                        * Note we must disable gc here otherwise it can mess
+                        * up the shadowing.
+                        *
+                        */
+                       dev->gc_disable = 1;
+                       yaffs_change_obj_name(obj, new_dir, new_name, force,
+                                             existing_target->obj_id);
+                       existing_target->is_shadowed = 1;
+                       yaffs_unlink_obj(existing_target);
+                       dev->gc_disable = 0;
+               }
+
+               result = yaffs_change_obj_name(obj, new_dir, new_name, 1, 0);
+
+               yaffs_update_parent(old_dir);
+               if (new_dir != old_dir)
+                       yaffs_update_parent(new_dir);
+
+               return result;
+       }
+       return YAFFS_FAIL;
+}
+
 /*----------------------- Initialisation Scanning ---------------------- */
 
-void yaffs_handle_shadowed_obj(yaffs_dev_t *dev, int obj_id,
-                               int backward_scanning)
+void yaffs_handle_shadowed_obj(struct yaffs_dev *dev, int obj_id,
+                              int backward_scanning)
 {
-       yaffs_obj_t *obj;
-
-       if (!backward_scanning) {
-               /* Handle YAFFS1 forward scanning case
-                * For YAFFS1 we always do the deletion
-                */
+       struct yaffs_obj *obj;
 
-       } else {
+       if (backward_scanning) {
                /* Handle YAFFS2 case (backward scanning)
                 * If the shadowed object exists then ignore.
                 */
                obj = yaffs_find_by_number(dev, obj_id);
-               if(obj)
+               if (obj)
                        return;
        }
 
-       /* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
+       /* Let's create it (if it does not exist) assuming it is a file so that
+        * it can do shrinking etc.
         * We put it in unlinked dir to be cleaned up after the scanning
         */
        obj =
-           yaffs_find_or_create_by_number(dev, obj_id,
-                                            YAFFS_OBJECT_TYPE_FILE);
+           yaffs_find_or_create_by_number(dev, obj_id, YAFFS_OBJECT_TYPE_FILE);
        if (!obj)
                return;
        obj->is_shadowed = 1;
        yaffs_add_obj_to_dir(dev->unlinked_dir, obj);
        obj->variant.file_variant.shrink_size = 0;
-       obj->valid = 1;         /* So that we don't read any other info for this file */
-
+       obj->valid = 1;         /* So that we don't read any other info. */
 }
 
-
-void yaffs_link_fixup(yaffs_dev_t *dev, yaffs_obj_t *hard_list)
+void yaffs_link_fixup(struct yaffs_dev *dev, struct list_head *hard_list)
 {
-       yaffs_obj_t *hl;
-       yaffs_obj_t *in;
-
-       while (hard_list) {
-               hl = hard_list;
-               hard_list = (yaffs_obj_t *) (hard_list->hard_links.next);
+       struct list_head *lh;
+       struct list_head *save;
+       struct yaffs_obj *hl;
+       struct yaffs_obj *in;
 
+       list_for_each_safe(lh, save, hard_list) {
+               hl = list_entry(lh, struct yaffs_obj, hard_links);
                in = yaffs_find_by_number(dev,
-                                             hl->variant.hardlink_variant.
-                                             equiv_id);
+                                       hl->variant.hardlink_variant.equiv_id);
 
                if (in) {
                        /* Add the hardlink pointers */
                        hl->variant.hardlink_variant.equiv_obj = in;
-                       ylist_add(&hl->hard_links, &in->hard_links);
+                       list_add(&hl->hard_links, &in->hard_links);
                } else {
                        /* Todo Need to report/handle this better.
                         * Got a problem... hardlink to a non-existant object
                         */
                        hl->variant.hardlink_variant.equiv_obj = NULL;
-                       YINIT_LIST_HEAD(&hl->hard_links);
-
+                       INIT_LIST_HEAD(&hl->hard_links);
                }
        }
 }
 
-
-static void yaffs_strip_deleted_objs(yaffs_dev_t *dev)
+static void yaffs_strip_deleted_objs(struct yaffs_dev *dev)
 {
        /*
-       *  Sort out state of unlinked and deleted objects after scanning.
-       */
-       struct ylist_head *i;
-       struct ylist_head *n;
-       yaffs_obj_t *l;
+        *  Sort out state of unlinked and deleted objects after scanning.
+        */
+       struct list_head *i;
+       struct list_head *n;
+       struct yaffs_obj *l;
 
        if (dev->read_only)
                return;
 
        /* Soft delete all the unlinked files */
-       ylist_for_each_safe(i, n,
-               &dev->unlinked_dir->variant.dir_variant.children) {
-               if (i) {
-                       l = ylist_entry(i, yaffs_obj_t, siblings);
-                       yaffs_del_obj(l);
-               }
+       list_for_each_safe(i, n,
+                          &dev->unlinked_dir->variant.dir_variant.children) {
+               l = list_entry(i, struct yaffs_obj, siblings);
+               yaffs_del_obj(l);
        }
 
-       ylist_for_each_safe(i, n,
-               &dev->del_dir->variant.dir_variant.children) {
-               if (i) {
-                       l = ylist_entry(i, yaffs_obj_t, siblings);
-                       yaffs_del_obj(l);
-               }
+       list_for_each_safe(i, n, &dev->del_dir->variant.dir_variant.children) {
+               l = list_entry(i, struct yaffs_obj, siblings);
+               yaffs_del_obj(l);
        }
-
 }
 
 /*
@@ -4229,29 +4263,29 @@ static void yaffs_strip_deleted_objs(yaffs_dev_t *dev)
  * - Directly or indirectly under root.
  *
  * Note:
- *  This code assumes that we don't ever change the current relationships between
- *  directories:
+ *  This code assumes that we don't ever change the current relationships
+ *  between directories:
  *   root_dir->parent == unlinked_dir->parent == del_dir->parent == NULL
  *   lost-n-found->parent == root_dir
  *
- * This fixes the problem where directories might have inadvertently been deleted
- * leaving the object "hanging" without being rooted in the directory tree.
+ * This fixes the problem where directories might have inadvertently been
+ * deleted leaving the object "hanging" without being rooted in the
+ * directory tree.
  */
-static int yaffs_has_null_parent(yaffs_dev_t *dev, yaffs_obj_t *obj)
+
+static int yaffs_has_null_parent(struct yaffs_dev *dev, struct yaffs_obj *obj)
 {
        return (obj == dev->del_dir ||
-               obj == dev->unlinked_dir||
-               obj == dev->root_dir);
+               obj == dev->unlinked_dir || obj == dev->root_dir);
 }
 
-static void yaffs_fix_hanging_objs(yaffs_dev_t *dev)
+static void yaffs_fix_hanging_objs(struct yaffs_dev *dev)
 {
-       yaffs_obj_t *obj;
-       yaffs_obj_t *parent;
+       struct yaffs_obj *obj;
+       struct yaffs_obj *parent;
        int i;
-       struct ylist_head *lh;
-       struct ylist_head *n;
+       struct list_head *lh;
+       struct list_head *n;
        int depth_limit;
        int hanging;
 
@@ -4263,375 +4297,137 @@ static void yaffs_fix_hanging_objs(yaffs_dev_t *dev)
         * Make sure it is rooted.
         */
 
-       for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-               ylist_for_each_safe(lh, n, &dev->obj_bucket[i].list) {
-                       if (lh) {
-                               obj = ylist_entry(lh, yaffs_obj_t, hash_link);
-                               parent= obj->parent;
-                               
-                               if(yaffs_has_null_parent(dev,obj)){
-                                       /* These directories are not hanging */
-                                       hanging = 0;
+       for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
+               list_for_each_safe(lh, n, &dev->obj_bucket[i].list) {
+                       obj = list_entry(lh, struct yaffs_obj, hash_link);
+                       parent = obj->parent;
+
+                       if (yaffs_has_null_parent(dev, obj)) {
+                               /* These directories are not hanging */
+                               hanging = 0;
+                       } else if (!parent ||
+                                  parent->variant_type !=
+                                  YAFFS_OBJECT_TYPE_DIRECTORY) {
+                               hanging = 1;
+                       } else if (yaffs_has_null_parent(dev, parent)) {
+                               hanging = 0;
+                       } else {
+                               /*
+                                * Need to follow the parent chain to
+                                * see if it is hanging.
+                                */
+                               hanging = 0;
+                               depth_limit = 100;
+
+                               while (parent != dev->root_dir &&
+                                      parent->parent &&
+                                      parent->parent->variant_type ==
+                                      YAFFS_OBJECT_TYPE_DIRECTORY &&
+                                      depth_limit > 0) {
+                                       parent = parent->parent;
+                                       depth_limit--;
                                }
-                               else if(!parent || parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
+                               if (parent != dev->root_dir)
                                        hanging = 1;
-                               else if(yaffs_has_null_parent(dev,parent))
-                                       hanging = 0;
-                               else {
-                                       /*
-                                        * Need to follow the parent chain to see if it is hanging.
-                                        */
-                                       hanging = 0;
-                                       depth_limit=100;
-
-                                       while(parent != dev->root_dir &&
-                                               parent->parent &&
-                                               parent->parent->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
-                                               depth_limit > 0){
-                                               parent = parent->parent;
-                                               depth_limit--;
-                                       }
-                                       if(parent != dev->root_dir)
-                                               hanging = 1;
-                               }
-                               if(hanging){
-                                       T(YAFFS_TRACE_SCAN,
-                                         (TSTR("Hanging object %d moved to lost and found" TENDSTR),
-                                               obj->obj_id));
-                                       yaffs_add_obj_to_dir(dev->lost_n_found,obj);
-                               }
+                       }
+                       if (hanging) {
+                               yaffs_trace(YAFFS_TRACE_SCAN,
+                                       "Hanging object %d moved to lost and found",
+                                       obj->obj_id);
+                               yaffs_add_obj_to_dir(dev->lost_n_found, obj);
                        }
                }
        }
 }
 
-
 /*
  * Delete directory contents for cleaning up lost and found.
  */
-static void yaffs_del_dir_contents(yaffs_obj_t *dir)
-{
-       yaffs_obj_t *obj;
-       struct ylist_head *lh;
-       struct ylist_head *n;
-
-       if(dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
-               YBUG();
-       
-       ylist_for_each_safe(lh, n, &dir->variant.dir_variant.children) {
-               if (lh) {
-                       obj = ylist_entry(lh, yaffs_obj_t, siblings);
-                       if(obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
-                               yaffs_del_dir_contents(obj);
-
-                       T(YAFFS_TRACE_SCAN,
-                               (TSTR("Deleting lost_found object %d" TENDSTR),
-                               obj->obj_id));
-
-                       /* Need to use UnlinkObject since Delete would not handle
-                        * hardlinked objects correctly.
-                        */
-                       yaffs_unlink_obj(obj); 
-               }
-       }
-                       
-}
-
-static void yaffs_empty_l_n_f(yaffs_dev_t *dev)
-{
-       yaffs_del_dir_contents(dev->lost_n_found);
-}
-
-static void yaffs_check_obj_details_loaded(yaffs_obj_t *in)
-{
-       __u8 *chunk_data;
-       yaffs_obj_header *oh;
-       yaffs_dev_t *dev;
-       yaffs_ext_tags tags;
-       int result;
-       int alloc_failed = 0;
-
-       if (!in)
-               return;
-
-       dev = in->my_dev;
-
-#if 0
-       T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
-               in->obj_id,
-               in->lazy_loaded ? "not yet" : "already"));
-#endif
-
-       if (in->lazy_loaded && in->hdr_chunk > 0) {
-               in->lazy_loaded = 0;
-               chunk_data = yaffs_get_temp_buffer(dev, __LINE__);
-
-               result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, chunk_data, &tags);
-               oh = (yaffs_obj_header *) chunk_data;
-
-               in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-               in->win_atime[0] = oh->win_atime[0];
-               in->win_ctime[0] = oh->win_ctime[0];
-               in->win_mtime[0] = oh->win_mtime[0];
-               in->win_atime[1] = oh->win_atime[1];
-               in->win_ctime[1] = oh->win_ctime[1];
-               in->win_mtime[1] = oh->win_mtime[1];
-#else
-               in->yst_uid = oh->yst_uid;
-               in->yst_gid = oh->yst_gid;
-               in->yst_atime = oh->yst_atime;
-               in->yst_mtime = oh->yst_mtime;
-               in->yst_ctime = oh->yst_ctime;
-               in->yst_rdev = oh->yst_rdev;
-
-#endif
-               yaffs_set_obj_name_from_oh(in, oh);
-
-               if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) {
-                       in->variant.symlink_variant.alias =
-                                                   yaffs_clone_str(oh->alias);
-                       if (!in->variant.symlink_variant.alias)
-                               alloc_failed = 1; /* Not returned to caller */
-               }
-
-               yaffs_release_temp_buffer(dev, chunk_data, __LINE__);
-       }
-}
-
-/*------------------------------  Directory Functions ----------------------------- */
-
-/*
- *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(yaffs_obj_t *obj)
-{
-       yaffs_dev_t *dev;
-       if(!obj)
-               return;
-#ifndef CONFIG_YAFFS_WINCE
-
-       dev = obj->my_dev;
-       obj->dirty = 1;
-       obj->yst_mtime = obj->yst_ctime = Y_CURRENT_TIME;
-       if(dev->param.defered_dir_update){
-               struct ylist_head *link = &obj->variant.dir_variant.dirty; 
-       
-               if(ylist_empty(link)){
-                       ylist_add(link,&dev->dirty_dirs);
-                       T(YAFFS_TRACE_BACKGROUND, (TSTR("Added object %d to dirty directories" TENDSTR),obj->obj_id));
-               }
-
-       } else
-               yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
-#endif
-}
-
-void yaffs_update_dirty_dirs(yaffs_dev_t *dev)
+static void yaffs_del_dir_contents(struct yaffs_obj *dir)
 {
-       struct ylist_head *link;
-       yaffs_obj_t *obj;
-       yaffs_dir_s *d_s;
-       yaffs_obj_variant *o_v;
-
-       T(YAFFS_TRACE_BACKGROUND, (TSTR("Update dirty directories" TENDSTR)));
-
-       while(!ylist_empty(&dev->dirty_dirs)){
-               link = dev->dirty_dirs.next;
-               ylist_del_init(link);
-               
-               d_s=ylist_entry(link,yaffs_dir_s,dirty);
-               o_v = ylist_entry(d_s,yaffs_obj_variant,dir_variant);
-               obj = ylist_entry(o_v,yaffs_obj_t,variant);
+       struct yaffs_obj *obj;
+       struct list_head *lh;
+       struct list_head *n;
 
-               T(YAFFS_TRACE_BACKGROUND, (TSTR("Update directory %d" TENDSTR), obj->obj_id));
+       if (dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
+               BUG();
 
-               if(obj->dirty)
-                       yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
+       list_for_each_safe(lh, n, &dir->variant.dir_variant.children) {
+               obj = list_entry(lh, struct yaffs_obj, siblings);
+               if (obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
+                       yaffs_del_dir_contents(obj);
+               yaffs_trace(YAFFS_TRACE_SCAN,
+                       "Deleting lost_found object %d",
+                       obj->obj_id);
+               yaffs_unlink_obj(obj);
        }
 }
 
-static void yaffs_remove_obj_from_dir(yaffs_obj_t *obj)
+static void yaffs_empty_l_n_f(struct yaffs_dev *dev)
 {
-       yaffs_dev_t *dev = obj->my_dev;
-       yaffs_obj_t *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);
-
-
-       ylist_del_init(&obj->siblings);
-       obj->parent = NULL;
-       
-       yaffs_verify_dir(parent);
+       yaffs_del_dir_contents(dev->lost_n_found);
 }
 
-void yaffs_add_obj_to_dir(yaffs_obj_t *directory,
-                                       yaffs_obj_t *obj)
-{
-       if (!directory) {
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR
-                  ("tragedy: Trying to add an object to a null pointer directory"
-                   TENDSTR)));
-               YBUG();
-               return;
-       }
-       if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR
-                  ("tragedy: Trying to add an object to a non-directory"
-                   TENDSTR)));
-               YBUG();
-       }
-
-       if (obj->siblings.prev == NULL) {
-               /* Not initialised */
-               YBUG();
-       }
-
-
-       yaffs_verify_dir(directory);
-
-       yaffs_remove_obj_from_dir(obj);
-
-
-       /* Now add it */
-       ylist_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);
-}
 
-yaffs_obj_t *yaffs_find_by_name(yaffs_obj_t *directory,
+struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory,
                                     const YCHAR *name)
 {
        int sum;
-
-       struct ylist_head *i;
+       struct list_head *i;
        YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
-
-       yaffs_obj_t *l;
+       struct yaffs_obj *l;
 
        if (!name)
                return NULL;
 
        if (!directory) {
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR
-                  ("tragedy: yaffs_find_by_name: null pointer directory"
-                   TENDSTR)));
-               YBUG();
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "tragedy: yaffs_find_by_name: null pointer directory"
+                       );
+               BUG();
                return NULL;
        }
-       if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR
-                  ("tragedy: yaffs_find_by_name: non-directory" TENDSTR)));
-               YBUG();
-       }
-
-       sum = yaffs_calc_name_sum(name);
-
-       ylist_for_each(i, &directory->variant.dir_variant.children) {
-               if (i) {
-                       l = ylist_entry(i, yaffs_obj_t, siblings);
-
-                       if (l->parent != directory)
-                               YBUG();
-
-                       yaffs_check_obj_details_loaded(l);
-
-                       /* Special case for lost-n-found */
-                       if (l->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
-                               if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
-                                       return l;
-                       } else if (yaffs_sum_cmp(l->sum, sum) || l->hdr_chunk <= 0) {
-                               /* LostnFound chunk called Objxxx
-                                * Do a real check
-                                */
-                               yaffs_get_obj_name(l, buffer,
-                                                   YAFFS_MAX_NAME_LENGTH + 1);
-                               if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0)
-                                       return l;
-                       }
-               }
+       if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "tragedy: yaffs_find_by_name: non-directory"
+                       );
+               BUG();
        }
 
-       return NULL;
-}
+       sum = yaffs_calc_name_sum(name);
 
+       list_for_each(i, &directory->variant.dir_variant.children) {
+               l = list_entry(i, struct yaffs_obj, siblings);
 
-#if 0
-int yaffs_ApplyToDirectoryChildren(yaffs_obj_t *the_dir,
-                                       int (*fn) (yaffs_obj_t *))
-{
-       struct ylist_head *i;
-       yaffs_obj_t *l;
+               if (l->parent != directory)
+                       BUG();
 
-       if (!the_dir) {
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR
-                  ("tragedy: yaffs_find_by_name: null pointer directory"
-                   TENDSTR)));
-               YBUG();
-               return YAFFS_FAIL;
-       }
-       if (the_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR
-                  ("tragedy: yaffs_find_by_name: non-directory" TENDSTR)));
-               YBUG();
-               return YAFFS_FAIL;
-       }
+               yaffs_check_obj_details_loaded(l);
 
-       ylist_for_each(i, &the_dir->variant.dir_variant.children) {
-               if (i) {
-                       l = ylist_entry(i, yaffs_obj_t, siblings);
-                       if (l && !fn(l))
-                               return YAFFS_FAIL;
+               /* Special case for lost-n-found */
+               if (l->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
+                       if (!strcmp(name, YAFFS_LOSTNFOUND_NAME))
+                               return l;
+               } else if (l->sum == sum || l->hdr_chunk <= 0) {
+                       /* LostnFound chunk called Objxxx
+                        * Do a real check
+                        */
+                       yaffs_get_obj_name(l, buffer,
+                               YAFFS_MAX_NAME_LENGTH + 1);
+                       if (!strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH))