yaffs: Change NEEDS_SCANNING to NEEDS_SCAN

[yaffs2.git] / yaffs_guts.c

diff --git a/yaffs_guts.c b/yaffs_guts.c
index e876309e4bfc288285da9f12ed7d2f7181905456..403ce11bb2cea2a0022ca496beec118f7fa0e1e8 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -323,7 +323,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++;
        }
@@ -1344,13 +1344,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);
@@ -3322,9 +3316,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;