yaffs: Remove tags validity checking code.

[yaffs2.git] / yaffs_guts.c

diff --git a/yaffs_guts.c b/yaffs_guts.c
index e876309e4bfc288285da9f12ed7d2f7181905456..c6d508c0c375ddd098b745ed5c1794080e7654ab 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -15,7 +15,6 @@
 #include "yaffs_trace.h"
 
 #include "yaffs_guts.h"
-#include "yaffs_tagsvalidity.h"
 #include "yaffs_getblockinfo.h"
 #include "yaffs_tagscompat.h"
 #include "yaffs_nand.h"
@@ -323,7 +322,7 @@ int yaffs_check_ff(u8 *buffer, int n_bytes)
 {
        /* Horrible, slow implementation */
        while (n_bytes--) {
-               if (*buffer != 0xFF)
+               if (*buffer != 0xff)
                        return 0;
                buffer++;
        }
@@ -645,7 +644,7 @@ static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block)
                        u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
 
                        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,
@@ -1344,13 +1343,7 @@ static int yaffs_change_obj_name(struct yaffs_obj *obj,
                BUG();
        }
 
-       /* 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);
-
+       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);
@@ -2421,7 +2414,7 @@ static inline int yaffs_gc_process_chunk(struct yaffs_dev *dev,
        int matching_chunk;
        int ret_val = YAFFS_OK;
 
-       yaffs_init_tags(&tags);
+       memset(&tags, 0, sizeof(tags));
        yaffs_rd_chunk_tags_nand(dev, old_chunk,
                                 buffer, &tags);
        object = yaffs_find_by_number(dev, tags.obj_id);
@@ -2977,7 +2970,7 @@ void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash,
        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);
@@ -3031,7 +3024,7 @@ static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk,
                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;
@@ -3322,9 +3315,9 @@ int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force,
 
                yaffs_verify_oh(in, oh, &old_tags, 0);
                memcpy(old_name, oh->name, sizeof(oh->name));
-               memset(buffer, 0xFF, sizeof(struct yaffs_obj_hdr));
+               memset(buffer, 0xff, sizeof(struct yaffs_obj_hdr));
        } else {
-               memset(buffer, 0xFF, dev->data_bytes_per_chunk);
+               memset(buffer, 0xff, dev->data_bytes_per_chunk);
        }
 
        oh->type = in->variant_type;
@@ -3382,7 +3375,7 @@ int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force,
                yaffs_apply_xattrib_mod(in, (char *)buffer, xmod);
 
        /* Tags */
-       yaffs_init_tags(&new_tags);
+       memset(&new_tags, 0, sizeof(new_tags));
        in->serial++;
        new_tags.chunk_id = 0;
        new_tags.obj_id = in->obj_id;