diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2015-03-31 15:31:57 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2015-03-31 15:31:57 +0000 |
| commit | 82f0308be91d572df10dadfe59f196e14760dc3d (patch) | |
| tree | 06f81e98d755d3b1d9a199b9b78a277ce3577b03 /target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c | |
| parent | 640318e62090821c1778dc9e3dfc5608bdcd7f0b (diff) | |
| download | upstream-82f0308be91d572df10dadfe59f196e14760dc3d.tar.gz upstream-82f0308be91d572df10dadfe59f196e14760dc3d.tar.bz2 upstream-82f0308be91d572df10dadfe59f196e14760dc3d.zip | |
kernel: update yaffs code to the latest version
Use the latest version of the yaffs code. Fetched from the
yaffs2 git tree and it is based on the following commit:
commit 7e5cf0fa1b694f835cdc184a8395b229fa29f9ae
Author: Charles Manning <cdhmanning@gmail.com>
Date: Thu Aug 7 11:25:05 2014 +1200
yaffs-direct: Basic tests. Add lpthread flag for background gc support
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 45188
Diffstat (limited to 'target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c')
| -rw-r--r-- | target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c b/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c index f1dc972276..8c31a661ff 100644 --- a/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c +++ b/target/linux/generic/files/fs/yaffs2/yaffs_yaffs2.c @@ -1193,12 +1193,14 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev, } if (!in->valid && in->variant_type != - (oh ? oh->type : tags.extra_obj_type)) + (oh ? oh->type : tags.extra_obj_type)) { yaffs_trace(YAFFS_TRACE_ERROR, - "yaffs tragedy: Bad object type, %d != %d, for object %d at chunk %d during scan", + "yaffs tragedy: Bad type, %d != %d, for object %d at chunk %d during scan", oh ? oh->type : tags.extra_obj_type, in->variant_type, tags.obj_id, chunk); + in = yaffs_retype_obj(in, oh ? oh->type : tags.extra_obj_type); + } if (!in->valid && (tags.obj_id == YAFFS_OBJECTID_ROOT || @@ -1439,7 +1441,7 @@ int yaffs2_scan_backwards(struct yaffs_dev *dev) bi++; } - yaffs_trace(YAFFS_TRACE_SCAN, "%d blocks to be sorted...", n_to_scan); + yaffs_trace(YAFFS_TRACE_ALWAYS, "%d blocks to be sorted...", n_to_scan); cond_resched(); |