diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /target/linux/generic/patches-3.8/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'target/linux/generic/patches-3.8/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch')
| -rw-r--r-- | target/linux/generic/patches-3.8/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.8/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch b/target/linux/generic/patches-3.8/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch new file mode 100644 index 000000000..d2bad0101 --- /dev/null +++ b/target/linux/generic/patches-3.8/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch @@ -0,0 +1,31 @@ +From 2505e8b0a13d3d5c5bbeaaae4eb889864f44c9df Mon Sep 17 00:00:00 2001 +From: Charles Manning <cdhmanning@gmail.com> +Date: Thu, 3 Feb 2011 05:55:30 +1300 +Subject: [PATCH] yaffs: Fix directory unlinking in yaffs1 mode + +commit 964b3425a71890e6701c830e38b04d8557c04f49 upstream. + +Treat both yaffs2 and yaffs1 paths the same. + +Signed-off-by: Charles Manning <cdhmanning@gmail.com> +--- + yaffs_guts.c | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +--- a/fs/yaffs2/yaffs_guts.c ++++ b/fs/yaffs2/yaffs_guts.c +@@ -1708,13 +1708,7 @@ static int yaffs_change_obj_name(yaffs_o + YBUG(); + } + +- /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */ +- if (obj->my_dev->param.is_yaffs2) +- unlinkOp = (new_dir == obj->my_dev->unlinked_dir); +- else +- unlinkOp = (new_dir == obj->my_dev->unlinked_dir +- && obj->variant_type == YAFFS_OBJECT_TYPE_FILE); +- ++ unlinkOp = (new_dir == obj->my_dev->unlinked_dir); + deleteOp = (new_dir == obj->my_dev->del_dir); + + existingTarget = yaffs_find_by_name(new_dir, new_name); |