yaffs: Fix directory unlinking in yaffs1 mode

Treat both yaffs2 and yaffs1 paths the same.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/yaffs_guts.c b/yaffs_guts.c
index e876309e4bfc288285da9f12ed7d2f7181905456..2fcb80b24929f825ae3f8f346a815ca2aa735c36 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -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);