diff options
| author | Charles Manning <cdhmanning@gmail.com> | 2011-02-03 05:55:30 +1300 |
|---|---|---|
| committer | Charles Manning <cdhmanning@gmail.com> | 2011-02-03 05:55:30 +1300 |
| commit | 964b3425a71890e6701c830e38b04d8557c04f49 (patch) | |
| tree | 5d86faf3f1ef39e2b3ea3abe8bd1a8b304077d7a /yaffs_guts.c | |
| parent | 6648cbf52d6695755941ff8607fd7a0cda542e05 (diff) | |
yaffs: Fix directory unlinking in yaffs1 mode
Treat both yaffs2 and yaffs1 paths the same.
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Diffstat (limited to 'yaffs_guts.c')
| -rw-r--r-- | yaffs_guts.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/yaffs_guts.c b/yaffs_guts.c index e876309..2fcb80b 100644 --- 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); |