Add Waldemar's patches for Linux 3.2

[yaffs2.git] / yaffs_guts.c

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 109a0b7f39214c43c9e48e1e9c4261ea740b69a5..9ade09b54e51680c7c507b3bc21566108144bbc6 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -27,6 +27,7 @@
 #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
@@ -597,7 +598,7 @@ static int yaffs_write_new_chunk(struct yaffs_dev *dev,
                yaffs_trace(YAFFS_TRACE_ERROR,
                        "**>> yaffs write required %d attempts",
                        attempts);
-               dev->n_retired_writes += (attempts - 1);
+               dev->n_retried_writes += (attempts - 1);
        }
 
        return chunk;
@@ -671,7 +672,6 @@ static u16 yaffs_calc_name_sum(const YCHAR *name)
 
 void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name)
 {
-#ifndef CONFIG_YAFFS_NO_SHORT_NAMES
        memset(obj->short_name, 0, sizeof(obj->short_name));
        if (name &&
                strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <=
@@ -679,7 +679,6 @@ void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name)
                strcpy(obj->short_name, name);
        else
                obj->short_name[0] = _Y('\0');
-#endif
        obj->sum = yaffs_calc_name_sum(name);
 }
 
@@ -2382,6 +2381,8 @@ void yaffs_block_became_dirty(struct yaffs_dev *dev, int block_no)
        bi->has_shrink_hdr = 0;
        bi->skip_erased_check = 1;      /* Clean, so no need to check */
        bi->gc_prioritise = 0;
+       bi->has_summary=0;
+
        yaffs_clear_chunk_bits(dev, block_no);
 
        yaffs_trace(YAFFS_TRACE_ERASE, "Erased block %d", block_no);
@@ -2557,6 +2558,8 @@ static int yaffs_gc_block(struct yaffs_dev *dev, int block, int whole_block)
 
        dev->gc_disable = 1;
 
+       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",
@@ -4413,13 +4416,11 @@ int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size)
 {
        memset(name, 0, buffer_size * sizeof(YCHAR));
        yaffs_check_obj_details_loaded(obj);
-       if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND)
+       if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
                strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1);
-#ifndef CONFIG_YAFFS_NO_SHORT_NAMES
-       else if (obj->short_name[0])
+       } else if (obj->short_name[0]) {
                strcpy(name, obj->short_name);
-#endif
-       else if (obj->hdr_chunk > 0) {
+       } else if (obj->hdr_chunk > 0) {
                int result;
                u8 *buffer = yaffs_get_temp_buffer(obj->my_dev);
 
@@ -4533,8 +4534,6 @@ static int yaffs_check_dev_fns(const struct yaffs_dev *dev)
        if (!dev->param.erase_fn || !dev->param.initialise_flash_fn)
                return 0;
 
-#ifdef CONFIG_YAFFS_YAFFS2
-
        /* Can use the "with tags" style interface for yaffs1 or yaffs2 */
        if (dev->param.write_chunk_tags_fn &&
            dev->param.read_chunk_tags_fn &&
@@ -4542,7 +4541,6 @@ static int yaffs_check_dev_fns(const struct yaffs_dev *dev)
            !dev->param.read_chunk_fn &&
            dev->param.bad_block_fn && dev->param.query_block_fn)
                return 1;
-#endif
 
        /* Can use the "spare" style interface for yaffs1 */
        if (!dev->param.is_yaffs2 &&
@@ -4813,6 +4811,11 @@ int yaffs_guts_initialise(struct yaffs_dev *dev)
        if (!init_failed && !yaffs_create_initial_dir(dev))
                init_failed = 1;
 
+       if(!init_failed && dev->param.is_yaffs2 &&
+               !dev->param.disable_summary &&
+               !yaffs_summary_init(dev))
+               init_failed = 1;
+
        if (!init_failed) {
                /* Now scan the flash. */
                if (dev->param.is_yaffs2) {
@@ -4875,7 +4878,7 @@ int yaffs_guts_initialise(struct yaffs_dev *dev)
        dev->n_page_writes = 0;
        dev->n_erasures = 0;
        dev->n_gc_copies = 0;
-       dev->n_retired_writes = 0;
+       dev->n_retried_writes = 0;
 
        dev->n_retired_blocks = 0;
 
@@ -4898,6 +4901,8 @@ void yaffs_deinitialise(struct yaffs_dev *dev)
 
                yaffs_deinit_blocks(dev);
                yaffs_deinit_tnodes_and_objs(dev);
+               yaffs_summary_deinit(dev);
+
                if (dev->param.n_caches > 0 && dev->cache) {
 
                        for (i = 0; i < dev->param.n_caches; i++) {