1 From 2505e8b0a13d3d5c5bbeaaae4eb889864f44c9df Mon Sep 17 00:00:00 2001
2 From: Charles Manning <cdhmanning@gmail.com>
3 Date: Thu, 3 Feb 2011 05:55:30 +1300
4 Subject: [PATCH] yaffs: Fix directory unlinking in yaffs1 mode
6 commit 964b3425a71890e6701c830e38b04d8557c04f49 upstream.
8 Treat both yaffs2 and yaffs1 paths the same.
10 Signed-off-by: Charles Manning <cdhmanning@gmail.com>
12 yaffs_guts.c | 8 +-------
13 1 file changed, 1 insertion(+), 7 deletions(-)
15 --- a/fs/yaffs2/yaffs_guts.c
16 +++ b/fs/yaffs2/yaffs_guts.c
17 @@ -1708,13 +1708,7 @@ static int yaffs_change_obj_name(yaffs_o
21 - /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
22 - if (obj->my_dev->param.is_yaffs2)
23 - unlinkOp = (new_dir == obj->my_dev->unlinked_dir);
25 - unlinkOp = (new_dir == obj->my_dev->unlinked_dir
26 - && obj->variant_type == YAFFS_OBJECT_TYPE_FILE);
28 + unlinkOp = (new_dir == obj->my_dev->unlinked_dir);
29 deleteOp = (new_dir == obj->my_dev->del_dir);
31 existingTarget = yaffs_find_by_name(new_dir, new_name);