X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.c;h=403ce11bb2cea2a0022ca496beec118f7fa0e1e8;hp=4ed4abd3780441a71a1ad8b13f7ae38df3a453b7;hb=d40cdc5adadebbc175a5c2339a678d8e4a4e4379;hpb=6500cebaa2c93512d544719956af259ca13f83b7

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 4ed4abd..403ce11 100644
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -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>
@@ -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;