diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2012-11-18 18:52:38 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2012-11-18 18:52:38 +0000 |
commit | 935ca3f3eb7435b50b91bc2ed341a4bbd6e759b0 (patch) | |
tree | 48e34d859046c692a221dddd165db5abc37feb90 /target/linux/generic/patches-3.7/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch | |
parent | d0226aff1d62d39530819938ac116ee3cbb93efa (diff) | |
download | master-31e0f0ae-935ca3f3eb7435b50b91bc2ed341a4bbd6e759b0.tar.gz master-31e0f0ae-935ca3f3eb7435b50b91bc2ed341a4bbd6e759b0.tar.bz2 master-31e0f0ae-935ca3f3eb7435b50b91bc2ed341a4bbd6e759b0.zip |
add 3.7-rc6 support (patch 820 still has to be fixed)
SVN-Revision: 34247
Diffstat (limited to 'target/linux/generic/patches-3.7/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch')
-rw-r--r-- | target/linux/generic/patches-3.7/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.7/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch b/target/linux/generic/patches-3.7/501-yaffs-Fix-directory-unlinking-in-yaffs1-mode.patch new file mode 100644 index 0000000000..d2bad01016 --- /dev/null +++ b/target/linux/generic/patches-3.7/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); |