From: Charles Manning Date: Thu, 24 Feb 2011 22:25:07 +0000 (+1300) Subject: yaffs: Remove tags validity checking code. X-Git-Tag: pre-block-summary~3 X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=9a20a1043042ed312c6d076ba2369d9138354702 yaffs: Remove tags validity checking code. It was only really useful during development and no longer serves any purpose. Signed-off-by: Charles Manning --- diff --git a/Makefile b/Makefile index 1dbafc6..14e3a29 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ ifneq ($(KERNELRELEASE),) yaffs2-objs += yaffs_mtdif1_single.o yaffs_packedtags1.o yaffs2-objs += yaffs_ecc.o yaffs_vfs_single.o yaffs_guts.o yaffs2-objs += yaffs_packedtags2.o - yaffs2-objs += yaffs_tagscompat.o yaffs_tagsvalidity.o + yaffs2-objs += yaffs_tagscompat.o yaffs2-objs += yaffs_checkptrw.o yaffs_nand.o yaffs2-objs += yaffs_checkptrw.o yaffs_nand.o yaffs_nameval.o yaffs2-objs += yaffs_allocator.o yaffs_bitmap.o yaffs_attribs.o @@ -42,7 +42,7 @@ ifneq ($(KERNELRELEASE),) yaffs2multi-objs += yaffs_mtdif1_multi.o yaffs_packedtags1.o yaffs2multi-objs += yaffs_ecc.o yaffs_vfs_multi.o yaffs_guts.o yaffs2multi-objs += yaffs_packedtags2.o - yaffs2multi-objs += yaffs_tagscompat.o yaffs_tagsvalidity.o + yaffs2multi-objs += yaffs_tagscompat.o yaffs2multi-objs += yaffs_checkptrw.o yaffs_nand.o yaffs2multi-objs += yaffs_checkptrw.o yaffs_nand.o yaffs_nameval.o yaffs2multi-objs += yaffs_allocator.o yaffs_bitmap.o yaffs_attribs.o diff --git a/Makefile.kernel b/Makefile.kernel index e63a28a..881c7f5 100644 --- a/Makefile.kernel +++ b/Makefile.kernel @@ -6,7 +6,7 @@ obj-$(CONFIG_YAFFS_FS) += yaffs.o yaffs-y := yaffs_ecc.o yaffs_vfs.o yaffs_guts.o yaffs_checkptrw.o yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o -yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o +yaffs-y += yaffs_tagscompat.o yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o yaffs-y += yaffs_nameval.o yaffs_attribs.o yaffs-y += yaffs_allocator.o diff --git a/direct/basic-test/Makefile b/direct/basic-test/Makefile index 214f4e9..92891ae 100644 --- a/direct/basic-test/Makefile +++ b/direct/basic-test/Makefile @@ -36,7 +36,7 @@ CFLAGS+= -DCONFIG_YAFFS_USE_PTHREADS -lpthread COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o \ yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \ yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \ - yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \ + yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \ yaffs_checkptrw.o yaffs_qsort.o\ yaffs_nameval.o yaffs_attribs.o \ yaffs_norif1.o ynorsim.o \ @@ -52,7 +52,7 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o \ YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \ yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h \ yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \ - yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \ + yaffs_checkptrw.h yaffs_checkptrw.c \ yaffs_nameval.c yaffs_nameval.h \ yaffs_trace.h yaffs_attribs.h \ yaffs_allocator.c yaffs_allocator.h \ diff --git a/direct/basic-test/yaffs_fileem2k.c b/direct/basic-test/yaffs_fileem2k.c index 33c1da0..17eb908 100644 --- a/direct/basic-test/yaffs_fileem2k.c +++ b/direct/basic-test/yaffs_fileem2k.c @@ -26,7 +26,6 @@ const char *yaffs_flashif2_c_version = "$Id: yaffs_fileem2k.c,v 1.24 2010-02-18 #include "yaffs_guts.h" #include "yaffs_fileem2k.h" #include "yaffs_packedtags2.h" -#include "yaffs_tagsvalidity.h" #include @@ -460,14 +459,10 @@ int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 * nread= read(h,tags,sizeof(struct yaffs_ext_tags)); if(nread != sizeof(struct yaffs_ext_tags)) retval = YAFFS_FAIL; - if(yaffs_check_all_ff((u8 *)tags,sizeof(struct yaffs_ext_tags))) - { - yaffs_init_tags(tags); - } + if(yaffs_check_all_ff((u8 *)tags, sizeof(struct yaffs_ext_tags))) + memset(tags, 0, sizeof(struct yaffs_ext_tags)); else - { tags->chunk_used = 1; - } } else { diff --git a/direct/python/Makefile b/direct/python/Makefile index 4a54185..35f14fb 100644 --- a/direct/python/Makefile +++ b/direct/python/Makefile @@ -34,7 +34,7 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o\ yaffs_nandif.o yaffs_attribs.o \ yaffsfs.o yaffs_ecc.o yaffs_guts.o \ yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \ - yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \ + yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \ yaffs_checkptrw.o yaffs_qsort.o\ yaffs_nameval.o \ yaffs_allocator.o \ @@ -52,7 +52,7 @@ YAFFSLIBOBJS = $(COMMONTESTOBJS) yaffs_python_helper.o YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \ yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h \ yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \ - yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \ + yaffs_checkptrw.h yaffs_checkptrw.c \ yaffs_nameval.c yaffs_nameval.h yaffs_attribs.h \ yaffs_trace.h \ yaffs_allocator.c yaffs_allocator.h \ diff --git a/direct/tests/Makefile b/direct/tests/Makefile index 00db67d..76dcd2b 100644 --- a/direct/tests/Makefile +++ b/direct/tests/Makefile @@ -33,7 +33,7 @@ CFLAGS += -Wextra -Wpointer-arith COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o\ yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \ yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \ - yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \ + yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \ yaffs_checkptrw.o yaffs_qsort.o\ yaffs_nameval.o yaffs_attribs.o \ yaffs_norif1.o ynorsim.o nor_stress.o yaffs_fsx.o \ @@ -53,7 +53,7 @@ ALLOBJS = $(sort $(YAFFSTESTOBJS)) YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \ yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h \ yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \ - yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \ + yaffs_checkptrw.h yaffs_checkptrw.c \ yaffs_nameval.c yaffs_nameval.h \ yaffs_trace.h yaffs_attribs.h \ yaffs_allocator.c yaffs_allocator.h \ diff --git a/direct/timothy_tests/dev/Makefile b/direct/timothy_tests/dev/Makefile index 672a33f..6e774ab 100644 --- a/direct/timothy_tests/dev/Makefile +++ b/direct/timothy_tests/dev/Makefile @@ -29,10 +29,24 @@ CFLAGS += -Wextra -Wpointer-arith #CFLAGS+= -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations #CFLAGS+= -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline +COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o\ + yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \ + yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \ + yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \ + yaffs_checkptrw.o yaffs_qsort.o\ + yaffs_nameval.o yaffs_attribs.o \ + yaffs_norif1.o ynorsim.o \ + yaffs_allocator.o \ + yaffs_bitmap.o \ + yaffs_yaffs1.o \ + yaffs_yaffs2.o \ + yaffs_verify.o + -COMMONTESTOBJS = yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \ +SSCOMMONTESTOBJS = yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \ yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \ - yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \ + yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \ + yaffs_attribs.o yaffs_allocator.o \ yaffs_checkptrw.o yaffs_qsort.o\ yaffs_nameval.o \ yaffs_norif1.o ynorsim.o \ @@ -49,12 +63,12 @@ YAFFSTESTOBJS = $(COMMONTESTOBJS) yaffs_tester.o message_buffer.o error_handler ALLOBJS = $(sort $(YAFFSTESTOBJS)) -YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffsinterface.h yportenv.h yaffs_tagscompat.c yaffs_tagscompat.h \ - yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h yaffs_nandemul2k.h \ - yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h yaffs_list.h \ - yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \ +YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \ + yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h \ + yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \ + yaffs_checkptrw.h yaffs_checkptrw.c \ yaffs_nameval.c yaffs_nameval.h \ - yaffs_qsort.c yaffs_qsort.h yaffs_trace.h \ + yaffs_trace.h yaffs_attribs.h \ yaffs_allocator.c yaffs_allocator.h \ yaffs_yaffs1.c yaffs_yaffs1.h \ yaffs_yaffs2.c yaffs_yaffs2.h \ @@ -62,15 +76,18 @@ YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h ya yaffs_verify.c yaffs_verify.h YAFFSDIRECTSYMLINKS = yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\ - yaffsfs.h yaffs_malloc.h ydirectenv.h \ - yaffs_flashif.c yaffscfg.h \ - yaffs_nandif.c yaffs_nandif.h + yaffsfs.h yaffs_osglue.h ydirectenv.h \ + yaffs_flashif.c yaffscfg.h yaffs_qsort.c \ + yaffs_nandemul2k.h yaffs_list.h \ + yaffs_attribs.c \ + yaffs_nandif.c yaffs_nandif.h yportenv.h \ + yaffs_hweight.c yaffs_hweight.h DIRECTEXTRASYMLINKS = yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\ yaffs_fileem.c yaffs_norif1.c yaffs_norif1.h \ yaffs_ramdisk.c yaffs_ramdisk.h yaffs_ramem2k.c \ - ynorsim.h ynorsim.c + ynorsim.h ynorsim.c yaffs_osglue.c SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS) #all: directtest2k boottest diff --git a/direct/timothy_tests/handle_tests/Makefile b/direct/timothy_tests/handle_tests/Makefile index 6ad275c..8ca9c1d 100644 --- a/direct/timothy_tests/handle_tests/Makefile +++ b/direct/timothy_tests/handle_tests/Makefile @@ -33,7 +33,7 @@ CFLAGS += -Wextra -Wpointer-arith COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o \ yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \ yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \ - yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \ + yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \ yaffs_checkptrw.o yaffs_qsort.o\ yaffs_nameval.o yaffs_attribs.o \ yaffs_norif1.o ynorsim.o \ @@ -59,7 +59,7 @@ ALLOBJS = $(sort $(YAFFSTESTOBJS)) $(PYTHONOBJS) YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \ yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h \ yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \ - yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \ + yaffs_checkptrw.h yaffs_checkptrw.c \ yaffs_nameval.c yaffs_nameval.h \ yaffs_trace.h yaffs_attribs.h \ yaffs_allocator.c yaffs_allocator.h \ diff --git a/direct/timothy_tests/mirror_tests/Makefile b/direct/timothy_tests/mirror_tests/Makefile index 8d74acf..05e41f4 100644 --- a/direct/timothy_tests/mirror_tests/Makefile +++ b/direct/timothy_tests/mirror_tests/Makefile @@ -33,7 +33,7 @@ CFLAGS += -Wextra -Wpointer-arith COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o \ yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \ yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \ - yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \ + yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \ yaffs_checkptrw.o yaffs_qsort.o\ yaffs_nameval.o yaffs_attribs.o \ yaffs_norif1.o ynorsim.o \ @@ -63,7 +63,7 @@ ALLOBJS = $(sort $(YAFFSTESTOBJS)) $(PYTHONOBJS) YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \ yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h \ yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \ - yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \ + yaffs_checkptrw.h yaffs_checkptrw.c \ yaffs_nameval.c yaffs_nameval.h \ yaffs_trace.h yaffs_attribs.h \ yaffs_allocator.c yaffs_allocator.h \ diff --git a/direct/timothy_tests/quick_tests/Makefile b/direct/timothy_tests/quick_tests/Makefile index f798ce9..ef339c5 100644 --- a/direct/timothy_tests/quick_tests/Makefile +++ b/direct/timothy_tests/quick_tests/Makefile @@ -33,7 +33,7 @@ CFLAGS += -Wextra -Wpointer-arith COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o \ yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \ yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \ - yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \ + yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \ yaffs_checkptrw.o yaffs_qsort.o\ yaffs_nameval.o yaffs_attribs.o \ yaffs_norif1.o ynorsim.o \ @@ -120,7 +120,7 @@ ALLOBJS = $(sort $(YAFFSTESTOBJS)) YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \ yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h \ yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \ - yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \ + yaffs_checkptrw.h yaffs_checkptrw.c \ yaffs_nameval.c yaffs_nameval.h \ yaffs_trace.h yaffs_attribs.h \ yaffs_allocator.c yaffs_allocator.h \ diff --git a/direct/timothy_tests/threading/Makefile b/direct/timothy_tests/threading/Makefile index 8006b79..e733471 100644 --- a/direct/timothy_tests/threading/Makefile +++ b/direct/timothy_tests/threading/Makefile @@ -33,7 +33,7 @@ CFLAGS += -Wextra -Wpointer-arith COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o \ yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \ yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \ - yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \ + yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \ yaffs_checkptrw.o yaffs_qsort.o\ yaffs_nameval.o yaffs_attribs.o \ yaffs_norif1.o ynorsim.o \ @@ -58,7 +58,7 @@ ALLOBJS = $(sort $(YAFFSTESTOBJS)) YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \ yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h \ yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \ - yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \ + yaffs_checkptrw.h yaffs_checkptrw.c \ yaffs_nameval.c yaffs_nameval.h \ yaffs_trace.h yaffs_attribs.h \ yaffs_allocator.c yaffs_allocator.h \ diff --git a/yaffs_guts.c b/yaffs_guts.c index 403ce11..c6d508c 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -15,7 +15,6 @@ #include "yaffs_trace.h" #include "yaffs_guts.h" -#include "yaffs_tagsvalidity.h" #include "yaffs_getblockinfo.h" #include "yaffs_tagscompat.h" #include "yaffs_nand.h" @@ -645,7 +644,7 @@ static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block) u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__); memset(buffer, 0xff, dev->data_bytes_per_chunk); - yaffs_init_tags(&tags); + memset(&tags, 0, sizeof(tags)); tags.seq_number = YAFFS_SEQUENCE_BAD_BLOCK; if (dev->param.write_chunk_tags_fn(dev, chunk_id - dev->chunk_offset, @@ -2415,7 +2414,7 @@ static inline int yaffs_gc_process_chunk(struct yaffs_dev *dev, int matching_chunk; int ret_val = YAFFS_OK; - yaffs_init_tags(&tags); + memset(&tags, 0, sizeof(tags)); yaffs_rd_chunk_tags_nand(dev, old_chunk, buffer, &tags); object = yaffs_find_by_number(dev, tags.obj_id); @@ -2971,7 +2970,7 @@ void yaffs_chunk_del(struct yaffs_dev *dev, int chunk_id, int mark_flash, if (!dev->param.is_yaffs2 && mark_flash && bi->block_state != YAFFS_BLOCK_STATE_COLLECTING) { - yaffs_init_tags(&tags); + memset(&tags, 0, sizeof(tags)); tags.is_deleted = 1; yaffs_wr_chunk_tags_nand(dev, chunk_id, NULL, &tags); yaffs_handle_chunk_update(dev, chunk_id, &tags); @@ -3025,7 +3024,7 @@ static int yaffs_wr_data_obj(struct yaffs_obj *in, int inode_chunk, return 0; /* Set up new tags */ - yaffs_init_tags(&new_tags); + memset(&new_tags, 0, sizeof(new_tags)); new_tags.chunk_id = inode_chunk; new_tags.obj_id = in->obj_id; @@ -3376,7 +3375,7 @@ int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force, yaffs_apply_xattrib_mod(in, (char *)buffer, xmod); /* Tags */ - yaffs_init_tags(&new_tags); + memset(&new_tags, 0, sizeof(new_tags)); in->serial++; new_tags.chunk_id = 0; new_tags.obj_id = in->obj_id; diff --git a/yaffs_guts.h b/yaffs_guts.h index 3a71167..3b01dfa 100644 --- a/yaffs_guts.h +++ b/yaffs_guts.h @@ -160,8 +160,6 @@ enum yaffs_obj_type { #define YAFFS_OBJECT_TYPE_MAX YAFFS_OBJECT_TYPE_SPECIAL struct yaffs_ext_tags { - - unsigned validity0; unsigned chunk_used; /* Status of the chunk: used or unused */ unsigned obj_id; /* If 0 this is not used */ unsigned chunk_id; /* If 0 this is a header, else a data chunk */ @@ -189,9 +187,6 @@ struct yaffs_ext_tags { unsigned extra_length; /* Length if it is a file */ unsigned extra_equiv_id; /* Equivalent object for a hard link */ - - unsigned validity1; - }; /* Spare structure for YAFFS1 */ diff --git a/yaffs_nand.c b/yaffs_nand.c index 557781b..0b59ec7 100644 --- a/yaffs_nand.c +++ b/yaffs_nand.c @@ -13,7 +13,6 @@ #include "yaffs_nand.h" #include "yaffs_tagscompat.h" -#include "yaffs_tagsvalidity.h" #include "yaffs_getblockinfo.h" @@ -58,11 +57,6 @@ int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev, if (tags) { tags->seq_number = dev->seq_number; tags->chunk_used = 1; - if (!yaffs_validate_tags(tags)) { - yaffs_trace(YAFFS_TRACE_ERROR, - "Writing uninitialised tags"); - BUG(); - } yaffs_trace(YAFFS_TRACE_WRITE, "Writing chunk %d tags %d %d", nand_chunk, tags->obj_id, tags->chunk_id); diff --git a/yaffs_packedtags2.c b/yaffs_packedtags2.c index d18f3e5..820bc41 100644 --- a/yaffs_packedtags2.c +++ b/yaffs_packedtags2.c @@ -14,7 +14,6 @@ #include "yaffs_packedtags2.h" #include "yportenv.h" #include "yaffs_trace.h" -#include "yaffs_tagsvalidity.h" /* This code packs a set of extended tags into a binary structure for * NAND storage @@ -108,7 +107,6 @@ void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t, struct yaffs_packed_tags2_tags_only *ptt) { memset(t, 0, sizeof(struct yaffs_ext_tags)); - yaffs_init_tags(t); if (ptt->seq_number == 0xffffffff) return; diff --git a/yaffs_tagsvalidity.c b/yaffs_tagsvalidity.c deleted file mode 100644 index afae310..0000000 --- a/yaffs_tagsvalidity.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. - * - * Copyright (C) 2002-2011 Aleph One Ltd. - * for Toby Churchill Ltd and Brightstar Engineering - * - * Created by Charles Manning - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#include "yaffs_tagsvalidity.h" - -#define VALID0 0xaaaaaaaa -#define VALID1 0x55555555 - -void yaffs_init_tags(struct yaffs_ext_tags *tags) -{ - memset(tags, 0, sizeof(struct yaffs_ext_tags)); - tags->validity0 = VALID0; - tags->validity1 = VALID1; -} - -int yaffs_validate_tags(struct yaffs_ext_tags *tags) -{ - return (tags->validity0 == VALID0 && tags->validity1 == VALID1); -} diff --git a/yaffs_tagsvalidity.h b/yaffs_tagsvalidity.h deleted file mode 100644 index 347d3dd..0000000 --- a/yaffs_tagsvalidity.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * YAFFS: Yet another Flash File System . A NAND-flash specific file system. - * - * Copyright (C) 2002-2011 Aleph One Ltd. - * for Toby Churchill Ltd and Brightstar Engineering - * - * Created by Charles Manning - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 2.1 as - * published by the Free Software Foundation. - * - * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. - */ - -#ifndef __YAFFS_TAGS_VALIDITY_H__ -#define __YAFFS_TAGS_VALIDITY_H__ - -#include "yaffs_guts.h" - -void yaffs_init_tags(struct yaffs_ext_tags *tags); -int yaffs_validate_tags(struct yaffs_ext_tags *tags); -#endif