From: Charles Manning <cdhmanning@gmail.com>
Date: Tue, 7 May 2013 04:06:57 +0000 (+1200)
Subject: Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
X-Git-Tag: aleph1-release~62
X-Git-Url: https://yaffs.net/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=cabb7b51f48a784fbd8bd04ea8878abe2196167a;hp=0d6314500c7d665df705d1af0ad18f5c9ee95f23

Merge branch 'master' of ssh://aleph1.co.uk/home/aleph1/git/yaffs2
---

diff --git a/direct/test-framework/FrameworkRules.mk b/direct/test-framework/FrameworkRules.mk
index 29eb44d..3b6088a 100644
--- a/direct/test-framework/FrameworkRules.mk
+++ b/direct/test-framework/FrameworkRules.mk
@@ -29,7 +29,7 @@ CFLAGS +=    -Wextra -Wpointer-arith
 #CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
 
 
-COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o\
+COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o yaffs_error.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_tagsmarshall.o \
@@ -59,6 +59,7 @@ YAFFSDIRECTSYMLINKS =  \
           yaffs_attribs.c \
           yaffs_nandif.c yaffs_nandif.h yportenv.h \
           yaffs_hweight.c yaffs_hweight.h \
+	  yaffs_error.c \
           yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h \
           yaffs_tagscompat.c yaffs_tagscompat.h \
           yaffs_tagsmarshall.c yaffs_tagsmarshall.h \
@@ -89,7 +90,7 @@ FRAMEWORKEXTRASYMLINKS = \
 FRAMEWORK_SOURCES = $(YAFFSDIRECTSYMLINKS) $(FRAMEWORKEXTRASYMLINKS)
 
 clean:
-	rm -f $(TARGETS) $(ALLOBJS) core $(FRAMEWORK_SOURCES)
+	rm -f $(TARGETS) $(ALLOBJS) core $(FRAMEWORK_SOURCES) $(CLEAN_OBJS)
 
 $(YAFFSDIRECTSYMLINKS):
 	ln -s $(YDI_DIR)/$@ $@
diff --git a/direct/test-framework/basic-tests/dtest.c b/direct/test-framework/basic-tests/dtest.c
index 3cd13ab..006aad7 100644
--- a/direct/test-framework/basic-tests/dtest.c
+++ b/direct/test-framework/basic-tests/dtest.c
@@ -3172,6 +3172,37 @@ void format_test(const char *mountpt)
 	printf("mount should return -1 returned %d\n", ret);
 }
 
+void dir_rename_test(const char *mountpt)
+{
+         char fname[100];
+         char dname[100];
+         int h;
+         int ret;
+
+         yaffs_start_up();
+         yaffs_mount(mountpt);
+
+         sprintf(fname,"%s/file",mountpt);
+         sprintf(dname,"%s/directory",mountpt);
+
+         h = yaffs_open(fname,O_CREAT | O_RDWR | O_TRUNC, 0666);
+         yaffs_close(h);
+
+         yaffs_mkdir(dname, 0666);
+
+         dump_directory_tree(mountpt);
+
+         printf("Try to rename %s to %s\n", fname, dname);
+         ret = yaffs_rename(fname, dname);
+         printf("result %d, %d\n", ret, yaffs_get_error());
+
+         printf("Try to rename %s to %s\n", dname, fname);
+         ret = yaffs_rename(dname, fname);
+         printf("result %d, %d\n", ret, yaffs_get_error());
+
+
+}
+
 int random_seed;
 int simulate_power_failure;
 
@@ -3252,8 +3283,8 @@ int main(int argc, char *argv[])
 	 //basic_utime_test("/yaffs2");
 	 //case_insensitive_test("/yaffs2");
 
-	 yy_test("/yaffs2");
-
+	 //yy_test("/yaffs2");
+	 dir_rename_test("/yaffs2");
 
 	 return 0;
 
diff --git a/direct/test-framework/timothy_tests/handle_tests/Makefile b/direct/test-framework/timothy_tests/handle_tests/Makefile
new file mode 100644
index 0000000..43347d2
--- /dev/null
+++ b/direct/test-framework/timothy_tests/handle_tests/Makefile
@@ -0,0 +1,43 @@
+# Makefile for handle_tests
+#
+#
+# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
+#
+# Copyright (C) 2003-2010 Aleph One Ltd.
+#
+#
+# Created by Timothy Manning <timothy@aleph1.co.uk>
+#
+# 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.
+#
+# NB Warning this Makefile does not include header dependencies.
+#
+
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
+CLEAN_OBJS = handle_test emfile-2k-0
+
+TESTFILES = 	handle_test.o 
+
+
+
+all: handle_test
+
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
+
+
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
+
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
+
+
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
+
+
+handle_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
diff --git a/direct/timothy_tests/handle_tests/README.txt b/direct/test-framework/timothy_tests/handle_tests/README.txt
similarity index 100%
rename from direct/timothy_tests/handle_tests/README.txt
rename to direct/test-framework/timothy_tests/handle_tests/README.txt
diff --git a/direct/timothy_tests/handle_tests/handle_test.c b/direct/test-framework/timothy_tests/handle_tests/handle_test.c
similarity index 100%
rename from direct/timothy_tests/handle_tests/handle_test.c
rename to direct/test-framework/timothy_tests/handle_tests/handle_test.c
diff --git a/direct/timothy_tests/handle_tests/handle_test.h b/direct/test-framework/timothy_tests/handle_tests/handle_test.h
similarity index 100%
rename from direct/timothy_tests/handle_tests/handle_test.h
rename to direct/test-framework/timothy_tests/handle_tests/handle_test.h
diff --git a/direct/test-framework/timothy_tests/is_yaffs_working_tests/Makefile b/direct/test-framework/timothy_tests/is_yaffs_working_tests/Makefile
new file mode 100644
index 0000000..f1288a6
--- /dev/null
+++ b/direct/test-framework/timothy_tests/is_yaffs_working_tests/Makefile
@@ -0,0 +1,41 @@
+# Makefile for test_1_yaffs_mount
+#
+#
+# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
+#
+# Copyright (C) 2003-2010 Aleph One Ltd.
+#
+#
+# Created by Timothy Manning <timothy@aleph1.co.uk>
+#
+# 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.
+#
+# NB Warning this Makefile does not include header dependencies.
+#
+
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
+
+CLEAN_OBJS = test_1_yaffs_mount emfile-2k-0
+TESTFILES = 	test_1_yaffs_mount.o  
+
+all: test_1_yaffs_mount
+
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
+
+
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
+
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
+
+
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
+
+
+test_1_yaffs_mount: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
diff --git a/direct/timothy_tests/is_yaffs_working_tests/README.txt b/direct/test-framework/timothy_tests/is_yaffs_working_tests/README.txt
similarity index 100%
rename from direct/timothy_tests/is_yaffs_working_tests/README.txt
rename to direct/test-framework/timothy_tests/is_yaffs_working_tests/README.txt
diff --git a/direct/timothy_tests/is_yaffs_working_tests/test_1_yaffs_mount.c b/direct/test-framework/timothy_tests/is_yaffs_working_tests/test_1_yaffs_mount.c
similarity index 100%
rename from direct/timothy_tests/is_yaffs_working_tests/test_1_yaffs_mount.c
rename to direct/test-framework/timothy_tests/is_yaffs_working_tests/test_1_yaffs_mount.c
diff --git a/direct/test-framework/timothy_tests/linux_tests/Makefile b/direct/test-framework/timothy_tests/linux_tests/Makefile
new file mode 100644
index 0000000..31cc5ec
--- /dev/null
+++ b/direct/test-framework/timothy_tests/linux_tests/Makefile
@@ -0,0 +1,41 @@
+# Makefile for linux_test
+#
+#
+# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
+#
+# Copyright (C) 2003-2010 Aleph One Ltd.
+#
+#
+# Created by Timothy Manning <timothy@aleph1.co.uk>
+#
+# 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.
+#
+# NB Warning this Makefile does not include header dependencies.
+#
+
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
+CLEAN_OBJS = linux_test emfile-2k-0
+
+TESTFILES = 	linux_test.o lib.o 
+
+all: linux_test
+
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
+
+
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
+
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
+
+
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
+
+
+linux_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
diff --git a/direct/timothy_tests/linux_tests/README.txt b/direct/test-framework/timothy_tests/linux_tests/README.txt
similarity index 100%
rename from direct/timothy_tests/linux_tests/README.txt
rename to direct/test-framework/timothy_tests/linux_tests/README.txt
diff --git a/direct/timothy_tests/linux_tests/lib.c b/direct/test-framework/timothy_tests/linux_tests/lib.c
similarity index 100%
rename from direct/timothy_tests/linux_tests/lib.c
rename to direct/test-framework/timothy_tests/linux_tests/lib.c
diff --git a/direct/timothy_tests/linux_tests/lib.h b/direct/test-framework/timothy_tests/linux_tests/lib.h
similarity index 100%
rename from direct/timothy_tests/linux_tests/lib.h
rename to direct/test-framework/timothy_tests/linux_tests/lib.h
diff --git a/direct/timothy_tests/linux_tests/linux_test.c b/direct/test-framework/timothy_tests/linux_tests/linux_test.c
similarity index 100%
rename from direct/timothy_tests/linux_tests/linux_test.c
rename to direct/test-framework/timothy_tests/linux_tests/linux_test.c
diff --git a/direct/timothy_tests/linux_tests/linux_test.h b/direct/test-framework/timothy_tests/linux_tests/linux_test.h
similarity index 100%
rename from direct/timothy_tests/linux_tests/linux_test.h
rename to direct/test-framework/timothy_tests/linux_tests/linux_test.h
diff --git a/direct/timothy_tests/quick_tests/Makefile b/direct/test-framework/timothy_tests/quick_tests/Makefile
similarity index 63%
rename from direct/timothy_tests/quick_tests/Makefile
rename to direct/test-framework/timothy_tests/quick_tests/Makefile
index 210857b..431c883 100644
--- a/direct/timothy_tests/quick_tests/Makefile
+++ b/direct/test-framework/timothy_tests/quick_tests/Makefile
@@ -1,4 +1,4 @@
-# Makefile for YAFFS direct stress tests
+# Makefile for quick_tests
 #
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
@@ -6,7 +6,7 @@
 # Copyright (C) 2003-2010 Aleph One Ltd.
 #
 #
-# Created by Charles Manning <charles@aleph1.co.uk>
+# Created by Timothy Manning <timothy@aleph1.co.uk>
 #
 # 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
@@ -14,37 +14,10 @@
 #
 # NB Warning this Makefile does not include header dependencies.
 #
-# $Id: Makefile,v 1.7 2010-02-25 22:34:47 charles Exp $
 
-#EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
-
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  -DCONFIG_YAFFS_DEFINES_TYPES
-
-CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
-CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing 
-#CFLAGS +=    -fno-strict-aliasing
-CFLAGS +=    -O0
-CFLAGS +=    -Wextra -Wpointer-arith
-#CFLAGS +=    -DCONFIG_YAFFS_VALGRIND_TEST
-
-#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 \
-		 yaffs_error.o \
-		 yaffs_summary.o
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
+CLEAN_OBJS = quick_tests emfile-2k-0
 
 TESTFILES = 	quick_tests.o lib.o \
 		test_yaffs_mount.o test_yaffs_mount_ENODEV.o test_yaffs_mount_ENAMETOOLONG.o test_yaffs_mount_EBUSY.o \
@@ -61,7 +34,7 @@ TESTFILES = 	quick_tests.o lib.o \
 		test_yaffs_truncate.o test_yaffs_truncate_ENOTDIR.o test_yaffs_truncate_EISDIR.o test_yaffs_truncate_ENOENT.o \
 		test_yaffs_truncate_EINVAL.o test_yaffs_truncate_big_file.o test_yaffs_truncate_ENOENT2.o test_yaffs_truncate_ELOOP.o \
 		test_yaffs_truncate_ELOOP_dir.o test_yaffs_truncate_EROFS.o test_yaffs_truncate_ENAMETOOLONG.o \
-		test_yaffs_truncate_NULL.o\
+		test_yaffs_truncate_NULL.o \
 		test_yaffs_write.o test_yaffs_write_EBADF.o test_yaffs_write_big_file.o test_yaffs_write_EROFS.o \
 		test_yaffs_read.o test_yaffs_read_EBADF.o test_yaffs_read_EINVAL.o\
 		test_yaffs_lseek.o test_yaffs_lseek_EBADF.o test_yaffs_lseek_EINVAL.o test_yaffs_lseek_big_file.o \
@@ -75,12 +48,12 @@ TESTFILES = 	quick_tests.o lib.o \
 		test_yaffs_chmod.o test_yaffs_chmod_ENOENT.o test_yaffs_chmod_ENOTDIR.o test_yaffs_chmod_EINVAL.o \
 		test_yaffs_chmod_ENOENT2.o test_yaffs_chmod_ELOOP_dir.o test_yaffs_chmod_ELOOP.o test_yaffs_chmod_EROFS.o \
 		test_yaffs_chmod_ENAMETOOLONG.o test_yaffs_chmod_NULL.o \
-		test_yaffs_fchmod.o test_yaffs_fchmod_EBADF.o test_yaffs_fchmod_EROFS.o test_yaffs_fchmod_EINVAL.o\
+		test_yaffs_fchmod_EROFS.o test_yaffs_fchmod_EINVAL.o\
 		test_yaffs_fsync.o test_yaffs_fsync_EBADF.o test_yaffs_fsync_EROFS.o \
 		test_yaffs_fdatasync.o test_yaffs_fdatasync_EBADF.o test_yaffs_fdatasync_EROFS.o test_yaffs_fdatasync_NULL.o \
 		test_yaffs_mkdir.o test_yaffs_mkdir_EEXIST.o test_yaffs_mkdir_ENOTDIR.o test_yaffs_mkdir_ENOENT.o \
 		test_yaffs_mkdir_ELOOP_dir.o test_yaffs_mkdir_EROFS.o test_yaffs_mkdir_ENAMETOOLONG.o test_yaffs_mkdir_NULL.o \
-		test_yaffs_fchmod.o test_yaffs_fchmod_EBADF.o test_yaffs_fchmod_EINVAL.o test_yaffs_fchmod_NULL.o \
+		test_yaffs_fchmod.o test_yaffs_fchmod_EBADF.o  test_yaffs_fchmod_NULL.o \
 		test_yaffs_symlink.o test_yaffs_symlink_ENOTDIR.o test_yaffs_symlink_EEXIST.o test_yaffs_symlink_ENOENT.o \
 		test_yaffs_symlink_ENOENT2.o test_yaffs_symlink_ELOOP_dir.o test_yaffs_symlink_EROFS.o test_yaffs_symlink_ENAMETOOLONG.o\
 		test_yaffs_symlink_NULL.o test_yaffs_symlink_NULL2.o \
@@ -95,7 +68,7 @@ TESTFILES = 	quick_tests.o lib.o \
 		test_yaffs_totalspace.o test_yaffs_totalspace_EINVAL.o test_yaffs_totalspace_ENAMETOOLONG.o test_yaffs_totalspace_NULL.o\
 		test_yaffs_inodecount.o test_yaffs_inodecount_EINVAL.o test_yaffs_inodecount_ENAMETOOLONG.o test_yaffs_inodecount_NULL.o\
 		test_yaffs_link.o test_yaffs_link_ENOENT.o test_yaffs_link_EEXIST.o test_yaffs_link_ENOTDIR.o \
-		test_yaffs_link_ENOTDIR2.o test_yaffs_link_ENOENT2.o test_yaffs_link_ENOENT3.o test_yaffs_link_ENOENT3.o \
+		test_yaffs_link_ENOTDIR2.o test_yaffs_link_ENOENT2.o test_yaffs_link_ENOENT3.o  \
 		test_yaffs_link_ENOENT4.o test_yaffs_link_ELOOP_dir.o test_yaffs_link_EROFS.o test_yaffs_link_ENAMETOOLONG.o \
 		test_yaffs_link_ENAMETOOLONG2.o test_yaffs_link_NULL.o test_yaffs_link_NULL2.o \
 		test_yaffs_rmdir.o test_yaffs_rmdir_EBUSY.o test_yaffs_rmdir_EINVAL.o test_yaffs_rmdir_ENOENT.o \
@@ -105,77 +78,28 @@ TESTFILES = 	quick_tests.o lib.o \
 		test_yaffs_rename_dir.o test_yaffs_rename_dir_ENOENT.o test_yaffs_rename_dir_ENOENT2.o test_yaffs_rename_dir_to_file.o \
 		test_yaffs_rename_file_to_dir.o test_yaffs_rename_EEXISTS.o  test_yaffs_rename_ELOOP_dir.o test_yaffs_rename_EROFS.o \
 		test_yaffs_rename_ENAMETOOLONG.o test_yaffs_rename_ENAMETOOLONG2.o test_yaffs_rename_NULL.o test_yaffs_rename_NULL2.o \
-		test_yaffs_lstat.o test_yaffs_lstat_ENOENT.o test_yaffs_lstat_ENOTDIR.o test_yaffs_lstat_ENAMETOOLONG.o \
+		test_yaffs_lstat.o test_yaffs_lstat_ENOENT.o test_yaffs_lstat_ENOTDIR.o test_yaffs_lstat_ENAMETOOLONG.o test_yaffs_rename_to_null_file.o \
+		test_yaffs_rename_file_over_file.o test_yaffs_rename_dir_over_dir.o test_yaffs_rename_full_dir_over_dir.o test_yaffs_rename_ENOTEMPTY.o \
 		test_yaffs_lstat_NULL.o \
 		test_yaffs_flush.o test_yaffs_flush_EBADF.o test_yaffs_flush_EROFS.o \
 		test_yaffs_dup.o test_yaffs_dup_EBADF.o 
 
 
+all: quick_tests
 
-		  
-
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) $(TESTFILES)
-
-ALLOBJS = $(sort $(YAFFSTESTOBJS))
-
-YAFFSDIRECTSYMLINKS =  \
-          yaffsfs.c yaffs_flashif.h yaffs_flashif2.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_error.c \
-          yaffs_nandif.c yaffs_nandif.h yportenv.h \
-          yaffs_hweight.c yaffs_hweight.h \
-          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_trace.h yaffs_attribs.h \
-          yaffs_allocator.c yaffs_allocator.h \
-          yaffs_yaffs1.c yaffs_yaffs1.h \
-          yaffs_yaffs2.c yaffs_yaffs2.h \
-          yaffs_bitmap.c yaffs_bitmap.h \
-          yaffs_verify.c yaffs_verify.h \
-          yaffs_summary.c yaffs_summary.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 yaffs_osglue.c
-
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS) $(PYTONOSYMLINKS)
-#all: directtest2k boottest
-
-all: quick_tests 
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
-
-$(PYTONOSYMLINKS):
-	ln -s ../../python/$@ $@
-
-
-
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
-
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
+FUZZER_OBJS = fuzzer.o
 
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
 
-quick_tests: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS)
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
 
 
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
 
 
 
+quick_tests: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
 
-clean:
-	rm -f quick_tests  $(ALLOBJS) core $(SYMLINKS) 
diff --git a/direct/timothy_tests/quick_tests/README.txt b/direct/test-framework/timothy_tests/quick_tests/README.txt
similarity index 100%
rename from direct/timothy_tests/quick_tests/README.txt
rename to direct/test-framework/timothy_tests/quick_tests/README.txt
diff --git a/direct/timothy_tests/quick_tests/lib.c b/direct/test-framework/timothy_tests/quick_tests/lib.c
similarity index 73%
rename from direct/timothy_tests/quick_tests/lib.c
rename to direct/test-framework/timothy_tests/quick_tests/lib.c
index 50723c3..4edc19e 100644
--- a/direct/timothy_tests/quick_tests/lib.c
+++ b/direct/test-framework/timothy_tests/quick_tests/lib.c
@@ -37,6 +37,7 @@ int get_exit_on_error(void)
 int EROFS_setup(void)
 {
 	int output= -1;
+	
 	output=yaffs_remount(YAFFS_MOUNT_POINT,1,1);
 	if (output<0){
 		print_message("failed to remount yaffs\n",2);
@@ -125,9 +126,58 @@ void join_paths(char *path1,char *path2,char *new_path )
 void print_message(char *message,char print_level)
 {
 	if (print_level <= PRINT_LEVEL){
-		printf(message);
+		printf("%s",message);
 	}
 }
-	
 
+/*same as forcing the rmdir of a directory*/
+int delete_dir(char *dir_name)
+{
+	char message[200];
+	yaffs_DIR *d;
+   	struct yaffs_dirent *de;
+   	struct yaffs_stat s;
+   	char str[100];
+	d = yaffs_opendir(dir_name);
+	//printf("%s\n",dir_name);
+	if(!d)
+	{
+		sprintf(message,"\nfailed to open dir %s \n was trying to delete this",dir_name);
+		print_message(message,1);
+
+		
+		get_error();
+		return -1;
+    }
+    
+    while((de = yaffs_readdir(d)) != NULL) {
+		//stats the file
+		sprintf(str,"%s/%s",dir_name,de->d_name);
+		yaffs_lstat(str,&s);
+		
+		if ((s.st_mode & S_IFMT) == S_IFDIR){
+			//it is a directory. call the function recursivly.
+			delete_dir(str);
+			yaffs_rmdir(str);
+		}else{
+			yaffs_unlink(str);
+		}
+	}
+	yaffs_rmdir(dir_name);
+	yaffs_closedir(d);
+	return 1;
+}
+
+void get_error(void)
+{
+	int error_code=0;
+	char message[30];
+	message[0]='\0';
+
+	error_code=yaffs_get_error();
+	sprintf(message,"yaffs_error code %d\n",error_code);
+	print_message(message,1);
+	sprintf(message,"error is : %s\n",yaffs_error_to_str(error_code));
+	print_message(message,1);
+}
 
diff --git a/direct/timothy_tests/quick_tests/lib.h b/direct/test-framework/timothy_tests/quick_tests/lib.h
similarity index 62%
rename from direct/timothy_tests/quick_tests/lib.h
rename to direct/test-framework/timothy_tests/quick_tests/lib.h
index c7d67d2..5e36ca0 100644
--- a/direct/timothy_tests/quick_tests/lib.h
+++ b/direct/test-framework/timothy_tests/quick_tests/lib.h
@@ -22,33 +22,35 @@
 
 
 #define YAFFS_MOUNT_POINT "/yaffs2/"
-#define FILE_NAME "foo"
+#define FILE_NAME "test_dir/foo"
 #define FILE_SIZE 10
 
 #define FILE_MODE (S_IREAD | S_IWRITE)
 #define FILE_SIZE_TRUNCATED 100
 #define FILE_TEXT "file foo "	/* keep space at end of string */
 #define FILE_TEXT_NBYTES 10
+#define TEST_DIR "/yaffs2/test_dir"
+#define DIR_PATH "/yaffs2/test_dir/new_directory"
+#define DIR_PATH2 "/yaffs2/test_dir/new_directory2"
+#define DIR_PATH2_FILE "/yaffs2/test_dir/new_directory2/foo"
+#define SYMLINK_PATH "/yaffs2/test_dir/sym_foo"
 
-#define DIR_PATH "/yaffs2/new_directory"
+#define HARD_LINK_PATH "/yaffs2/test_dir/hard_link"
 
-#define SYMLINK_PATH "/yaffs2/sym_foo"
+#define NODE_PATH "/yaffs2/test_dir/node"
 
-#define HARD_LINK_PATH "/yaffs2/hard_link"
+#define RENAME_PATH "/yaffs2/test_dir/foo2"
 
-#define NODE_PATH "/yaffs2/node"
+#define RENAME_DIR_PATH "/yaffs2/test_dir/dir2"
 
-#define RENAME_PATH "/yaffs2/foo2"
+#define ELOOP_PATH "/yaffs2/test_dir/ELOOP"
+#define ELOOP2_PATH "/yaffs2/test_dir/ELOOP2"
 
-#define RENAME_DIR_PATH "/yaffs2/dir2"
-
-#define ELOOP_PATH "/yaffs2/ELOOP"
-#define ELOOP2_PATH "/yaffs2/ELOOP2"
-
-#define RMDIR_PATH "/yaffs2/RM_DIR"
+#define RMDIR_PATH "/yaffs2/test_dir/RM_DIR"
 
 /* warning do not define anything as FILE because there seems to be a conflict with stdio.h */ 
-#define FILE_PATH "/yaffs2/foo"
+#define FILE_PATH "/yaffs2/test_dir/foo"
+#define FILE_PATH2 "/yaffs2/test_dir/foo2"
 
 void join_paths(char *path1,char *path2,char *new_path );
 void print_message(char *message,char print_level);
@@ -58,4 +60,6 @@ int get_exit_on_error(void);
 int set_up_ELOOP(void);
 int EROFS_setup(void);
 int EROFS_clean(void);
+int delete_dir(char *dir_name);
+void get_error(void);
 #endif
diff --git a/direct/timothy_tests/quick_tests/quick_tests.c b/direct/test-framework/timothy_tests/quick_tests/quick_tests.c
similarity index 91%
rename from direct/timothy_tests/quick_tests/quick_tests.c
rename to direct/test-framework/timothy_tests/quick_tests/quick_tests.c
index a3f6463..c083d03 100644
--- a/direct/timothy_tests/quick_tests/quick_tests.c
+++ b/direct/test-framework/timothy_tests/quick_tests/quick_tests.c
@@ -50,14 +50,15 @@ int main(int argc, char *argv[])
 	}	
 	/*this is where the loop should break to*/
 	quit_quick_tests(0);
+	
 }
 
 
 void run_random_test_loop(void)
 {
 	int id=0;
-	int x=0;
-	int run_list[total_number_of_tests];
+	unsigned int x=0;
+	//int run_list[total_number_of_tests];
 	for (x=0;x<total_number_of_tests;x++){ 
 		id = (rand() % (total_number_of_tests-1));
 		run_test(id); 	
@@ -77,9 +78,11 @@ void logical_run_of_tests(void)
 void run_test(int x)
 {
 	int output=0;
+	int y= 0;
 	char message[200];
 	message[0]='\0';
 
+	yaffs_mkdir(TEST_DIR,S_IWRITE | S_IREAD);
 	yaffs_set_error(0);	/*reset the last error to 0 */
 	//printf("foo exists %d\n",test_yaffs_open());
 	sprintf(message,"\nrunning test: %s \n",test_list[x].name_of_test);
@@ -92,7 +95,7 @@ void run_test(int x)
 		num_of_tests_pass++;
 	} else {
 		/*test is assumed to have failed*/
-		//printf("test failed\n");
+		printf("test failed\n");
 		sprintf(message,"test: %s failed\n",test_list[x].name_of_test);
 		print_message(message,1);		
 		num_of_tests_failed ++;	
@@ -121,12 +124,18 @@ void run_test(int x)
 		sprintf(message,"\ttest clean: %s passed\n",test_list[x].name_of_test);
 		print_message(message,3);
 	}
+	/* close all open handles */
+	for (y=0; y<100;y++){
+		yaffs_close(y);
+	}
+	delete_dir(TEST_DIR);
 }
 
 void quit_quick_tests(int exit_code)
 {
-	char message[30];
-	message[0]='\0';	
+	/*char message[30];
+	message[0]='\0';
+	*/	
 	if (num_of_tests_pass==total_number_of_tests &&  num_of_tests_failed==0){
 		printf("\t OK --all tests passed\n");
 	}
@@ -135,24 +144,12 @@ void quit_quick_tests(int exit_code)
 	exit(exit_code);
 }
 
-void get_error(void)
-{
-	int error_code=0;
-	char message[30];
-	message[0]='\0';
-
-	error_code=yaffs_get_error();
-	sprintf(message,"yaffs_error code %d\n",error_code);
-	print_message(message,1);
-	sprintf(message,"error is : %s\n",yaffs_error_to_str(error_code));
-	print_message(message,1);
-}
 
 void init_quick_tests(int argc, char *argv[])
 {
 	int trace=0;
 	int new_option;
-	int x=0;	
+	//int x=0;	
 	do{
 		new_option=getopt_long(argc,argv,short_options,long_options,NULL);		
 		if (new_option=='h'){
diff --git a/direct/timothy_tests/quick_tests/quick_tests.h b/direct/test-framework/timothy_tests/quick_tests/quick_tests.h
similarity index 96%
rename from direct/timothy_tests/quick_tests/quick_tests.h
rename to direct/test-framework/timothy_tests/quick_tests/quick_tests.h
index 9967563..324d3c4 100644
--- a/direct/timothy_tests/quick_tests/quick_tests.h
+++ b/direct/test-framework/timothy_tests/quick_tests/quick_tests.h
@@ -84,7 +84,7 @@
 
 #include "test_yaffs_read.h"
 #include "test_yaffs_read_EBADF.h"
-#include "test_yaffs_read_EINVAL.h"
+//#include "test_yaffs_read_EINVAL.h"
 
 #include "test_yaffs_lseek.h"
 #include "test_yaffs_lseek_EBADF.h"
@@ -241,6 +241,11 @@
 #include "test_yaffs_rename_ENAMETOOLONG2.h"
 #include "test_yaffs_rename_NULL.h"
 #include "test_yaffs_rename_NULL2.h"
+#include "test_yaffs_rename_file_over_file.h"
+#include "test_yaffs_rename_dir_over_dir.h"
+#include "test_yaffs_rename_to_null_file.h"
+#include "test_yaffs_rename_full_dir_over_dir.h"
+#include "test_yaffs_rename_ENOTEMPTY.h"
 
 #include "test_yaffs_lstat.h"
 #include "test_yaffs_lstat_ENOENT.h"
@@ -334,7 +339,7 @@ test_template test_list[]={
 
 	{test_yaffs_read,test_yaffs_read_clean,"test_yaffs_read"},
 	{test_yaffs_read_EBADF,test_yaffs_read_EBADF_clean,"test_yaffs_read_EBADF"},
-	{test_yaffs_read_EINVAL,test_yaffs_read_EINVAL_clean,"test_yaffs_read_EINVAL"},
+//	{test_yaffs_read_EINVAL,test_yaffs_read_EINVAL_clean,"test_yaffs_read_EINVAL"},
 
 	{test_yaffs_stat,test_yaffs_stat_clean,"test_yaffs_stat"},
 	{test_yaffs_stat_ENOENT,test_yaffs_stat_ENOENT_clean,"test_yaffs_stat_ENOENT"},
@@ -495,6 +500,11 @@ test_template test_list[]={
 	{test_yaffs_rename_ENAMETOOLONG2,test_yaffs_rename_ENAMETOOLONG2_clean,"test_yaffs_rename_ENAMETOOLONG2"},
 	{test_yaffs_rename_NULL,test_yaffs_rename_NULL_clean,"test_yaffs_rename_NULL"},
 	{test_yaffs_rename_NULL2,test_yaffs_rename_NULL2_clean,"test_yaffs_rename_NULL2"},
+	{test_yaffs_rename_to_null_file,test_yaffs_rename_to_null_file_clean,"test_yaffs_rename_to_null_file"},
+	{test_yaffs_rename_file_over_file,test_yaffs_rename_file_over_file_clean,"test_yaffs_rename_file_over_file"},
+	{test_yaffs_rename_dir_over_dir,test_yaffs_rename_dir_over_dir_clean,"test_yaffs_rename_dir_over_dir"},
+	{test_yaffs_rename_full_dir_over_dir,test_yaffs_rename_full_dir_over_dir_clean,"test_yaffs_rename_full_dir_over_dir"},
+	{test_yaffs_rename_ENOTEMPTY,test_yaffs_rename_ENOTEMPTY_clean,"test_yaffs_rename_ENOTEMPTY"},
 
 	{test_yaffs_lstat,test_yaffs_lstat_clean,"test_yaffs_lstat"},
 	{test_yaffs_lstat_ENOENT,test_yaffs_lstat_ENOENT_clean,"test_yaffs_lstat_ENOENT"},
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access.c
similarity index 75%
rename from direct/timothy_tests/quick_tests/test_yaffs_access.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access.c
index 1e516bc..23b8c03 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_access.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access.c
@@ -15,7 +15,12 @@
 
 int test_yaffs_access(void)
 {
-		return yaffs_access(FILE_PATH,0);
+
+	if (-1==yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	return yaffs_access(FILE_PATH,0);
 }
 
 int test_yaffs_access_clean(void)
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_EACCES.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EACCES.c
similarity index 88%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_EACCES.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EACCES.c
index 1cbd0a6..f488130 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_access_EACCES.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EACCES.c
@@ -17,6 +17,10 @@ int test_yaffs_access_EACCES(void)
 {
 	int output=0;
 	int error=0;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file before remounting\n",1);
+		return -1;
+	}
 	output=yaffs_chmod(FILE_PATH,S_IREAD);
 	if (output<0){
 		print_message("failed to chmod file\n",2);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_EACCES.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EACCES.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_EACCES.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EACCES.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ELOOP.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ELOOP.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ELOOP.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ELOOP.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ELOOP.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ELOOP.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ELOOP.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ELOOP.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ENOENT2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOENT2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ENOENT2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOENT2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ENOENT2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOENT2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ENOENT2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOENT2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOTDIR.c
similarity index 82%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOTDIR.c
index afd3e07..a9718a8 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_access_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOTDIR.c
@@ -19,8 +19,11 @@ int test_yaffs_access_ENOTDIR(void)
 {
 	int output=0;
 	int error_code=0;
-	
-	output=yaffs_access("/yaffs2/foo/file",0);
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output=yaffs_access("/yaffs2/test_dir/foo/file",0);
 	if (output==-1){
 		error_code=yaffs_get_error();
 		if (abs(error_code)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EROFS.c
similarity index 86%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EROFS.c
index 0560337..bf223e0 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_access_EROFS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EROFS.c
@@ -17,6 +17,10 @@ int test_yaffs_access_EROFS(void)
 {
 	int output=0;
 	int error=0;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file before remounting\n",1);
+		return -1;
+	}
 	if (EROFS_setup() < 0 ){
 		return -1;
 	}
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_access_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_access_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_access_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod.c
similarity index 76%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod.c
index 7259fcb..9a8cac9 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_chmod.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod.c
@@ -15,7 +15,13 @@
 
 int test_yaffs_chmod(void)
 {
-	int output=yaffs_chmod(FILE_PATH,S_IREAD|S_IWRITE);
+	int output=0;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	
+	output=yaffs_chmod(FILE_PATH,S_IREAD|S_IWRITE);
 
 	if (output>=0){
 		/* there were no errors */
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOENT2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOTDIR.c
similarity index 79%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOTDIR.c
index 4587315..86155b2 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOTDIR.c
@@ -16,7 +16,11 @@
 int test_yaffs_chmod_ENOTDIR(void)
 {
 	int error=0;
-	int output=yaffs_chmod("/yaffs2/foo/file",S_IREAD|S_IWRITE);
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	int output=yaffs_chmod("/yaffs2/test_dir/foo/file",S_IREAD|S_IWRITE);
 
 	if (output<0){
 		error=yaffs_get_error();
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_EROFS.c
similarity index 87%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_EROFS.c
index fd8af69..cff0503 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_chmod_EROFS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_EROFS.c
@@ -17,7 +17,10 @@ int test_yaffs_chmod_EROFS(void)
 {
 	int error=0;
 	int output;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	EROFS_setup();
 
 	output = yaffs_chmod(FILE_PATH,S_IREAD|S_IWRITE);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_chmod_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_chmod_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_chmod_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_close.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_close.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_close.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_close.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_close.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_close.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_close.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_close.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_close_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_close_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_close_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_close_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_close_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_close_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_close_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_close_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_close_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_close_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_close_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_close_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_close_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_close_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_close_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_close_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_dup.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_dup.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_dup.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_dup.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_dup.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_dup.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_dup.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_dup.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_dup_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_dup_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_dup_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_dup_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_dup_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_dup_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_dup_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_dup_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fchmod.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fchmod.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fchmod.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fchmod.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fchmod_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fchmod_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fchmod_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fchmod_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fchmod_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fchmod_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fchmod_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fchmod_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fchmod_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EROFS.c
similarity index 89%
rename from direct/timothy_tests/quick_tests/test_yaffs_fchmod_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EROFS.c
index 250ebc6..d0df070 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_fchmod_EROFS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EROFS.c
@@ -18,6 +18,10 @@ int test_yaffs_fchmod_EROFS(void)
 {
 	int error = 0;
 	int output = 0;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	if (EROFS_setup() < 0 ){
 		return -1;
 	}
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fchmod_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fchmod_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fchmod_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fchmod_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fchmod_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fchmod_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fchmod_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fdatasync.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fdatasync.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fdatasync.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fdatasync.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fdatasync_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fdatasync_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fdatasync_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fdatasync_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fdatasync_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_EROFS.c
similarity index 89%
rename from direct/timothy_tests/quick_tests/test_yaffs_fdatasync_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_EROFS.c
index bad5f01..6aee590 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_fdatasync_EROFS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_EROFS.c
@@ -19,6 +19,10 @@ int test_yaffs_fdatasync_EROFS(void)
 {
 	int output = 0;
 	int error_code = 0;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	EROFS_setup();
 	handle = yaffs_open(FILE_PATH,O_CREAT  ,S_IREAD  );
 	if (handle<0){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fdatasync_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fdatasync_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fdatasync_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fdatasync_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fdatasync_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fdatasync_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fdatasync_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_flush.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_flush.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_flush.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_flush.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_flush_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_flush_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_flush_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_flush_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_flush_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush_EROFS.c
similarity index 89%
rename from direct/timothy_tests/quick_tests/test_yaffs_flush_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush_EROFS.c
index 41a7450..61138df 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_flush_EROFS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush_EROFS.c
@@ -19,6 +19,10 @@ int test_yaffs_flush_EROFS(void)
 {
 	int output=0;
 	int error =0;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	EROFS_setup();
 	handle = yaffs_open(FILE_PATH,O_CREAT  ,S_IREAD  );
 	if (handle<0){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_flush_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_flush_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_flush_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_freespace.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_freespace.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_freespace.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_freespace.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_freespace_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_freespace_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_freespace_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_freespace_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_freespace_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_freespace_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_freespace_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_freespace_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_freespace_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_freespace_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_freespace_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_freespace_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_freespace_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fstat.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fstat.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fstat.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fstat.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fstat.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fstat.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fstat.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fstat.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fstat_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fstat_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fstat_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fstat_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fstat_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fstat_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fstat_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fstat_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fsync.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fsync.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fsync.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fsync.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fsync_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fsync_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fsync_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fsync_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fsync_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync_EROFS.c
similarity index 89%
rename from direct/timothy_tests/quick_tests/test_yaffs_fsync_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync_EROFS.c
index 729fad1..8a656be 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_fsync_EROFS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync_EROFS.c
@@ -19,7 +19,10 @@ int test_yaffs_fsync_EROFS(void)
 {
 	int output = 0;
 	int error_code = 0;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	EROFS_setup();
 	handle = yaffs_open(FILE_PATH,O_CREAT  ,S_IREAD  );
 	if (handle<0){
@@ -29,6 +32,7 @@ int test_yaffs_fsync_EROFS(void)
 	output = yaffs_fsync(handle);
 	if (output==-1){
 		error_code=yaffs_get_error();
+
 		if (abs(error_code)==EROFS){
 			return 1;
 		} else {
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_fsync_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_fsync_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_fsync_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_ftruncate.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_ftruncate.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EROFS.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EROFS.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_ftruncate_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate_big_file.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_big_file.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_ftruncate_big_file.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_big_file.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_ftruncate_big_file.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_big_file.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_ftruncate_big_file.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_ftruncate_big_file.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_inodecount.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_inodecount.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_inodecount.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_inodecount.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_inodecount_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_inodecount_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_inodecount_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_inodecount_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_inodecount_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_inodecount_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_inodecount_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_inodecount_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_inodecount_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_inodecount_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_inodecount_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_inodecount_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_inodecount_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link.c
similarity index 87%
rename from direct/timothy_tests/quick_tests/test_yaffs_link.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link.c
index 7aa8aab..dc70bde 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_link.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link.c
@@ -18,6 +18,10 @@
 int test_yaffs_link(void)
 {
 	int output=0;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	output = yaffs_link(FILE_PATH,HARD_LINK_PATH);
 	return output;
 }
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_EEXIST.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_EEXIST.c
similarity index 91%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_EEXIST.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_EEXIST.c
index 18a540b..e97d3bb 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_link_EEXIST.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_EEXIST.c
@@ -19,7 +19,10 @@ int test_yaffs_link_EEXIST(void)
 {
 	int output=0;	
 	int error =0;
-	
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	output = yaffs_link(FILE_PATH,HARD_LINK_PATH);
 	if (output<0){
 		print_message("failed to create the first hard link\n",2);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_EEXIST.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_EEXIST.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_EEXIST.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_EEXIST.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENAMETOOLONG2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT3.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT3.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT3.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT3.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT3.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT3.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT3.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT3.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT4.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT4.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT4.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT4.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT4.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT4.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOENT4.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOENT4.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR.c
similarity index 86%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR.c
index 62c8065..0d54023 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR.c
@@ -19,7 +19,11 @@ int test_yaffs_link_ENOTDIR(void)
 {
 	int output=0;	
 	int error =0;
-	output = yaffs_link("/yaffs2/foo/file",HARD_LINK_PATH);
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output = yaffs_link("/yaffs2/test_dir/foo/file",HARD_LINK_PATH);
 	if (output<0){
 		error=yaffs_get_error();
 		if (abs(error)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR2.c
similarity index 86%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR2.c
index 32d1e0b..15f6f87 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR2.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR2.c
@@ -19,7 +19,11 @@ int test_yaffs_link_ENOTDIR2(void)
 {
 	int output=0;	
 	int error =0;
-	output = yaffs_link(FILE_PATH,"yaffs2/foo/hard_link");
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output = yaffs_link(FILE_PATH,"yaffs2/test_dir/foo/hard_link");
 	if (output<0){
 		error=yaffs_get_error();
 		if (abs(error)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_ENOTDIR2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_EROFS.c
similarity index 90%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_EROFS.c
index da4abd6..d3ab40e 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_link_EROFS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_EROFS.c
@@ -19,7 +19,10 @@ int test_yaffs_link_EROFS(void)
 {
 	int output=0;	
 	int error =0;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	EROFS_setup();
 
 	output = yaffs_link(FILE_PATH,HARD_LINK_PATH);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_NULL2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_NULL2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_NULL2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_NULL2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_link_NULL2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_NULL2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_link_NULL2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_link_NULL2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lseek.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lseek.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lseek_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lseek_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lseek_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lseek_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EROFS.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lseek_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EROFS.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lseek_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek_big_file.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_big_file.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lseek_big_file.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_big_file.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lseek_big_file.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_big_file.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lseek_big_file.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lseek_big_file.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lstat.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lstat.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lstat.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lstat.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lstat_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lstat_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lstat_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lstat_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lstat_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lstat_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lstat_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lstat_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lstat_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENOTDIR.c
similarity index 96%
rename from direct/timothy_tests/quick_tests/test_yaffs_lstat_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENOTDIR.c
index 665ff9f..5dfa1bb 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_lstat_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENOTDIR.c
@@ -40,7 +40,7 @@ int test_yaffs_lstat_ENOTDIR(void)
 		}
 	}
 	
-	output =yaffs_lstat("yaffs2/foo/dir",&stat);
+	output =yaffs_lstat("yaffs2/test_dir/foo/dir",&stat);
 	if (output<0){
 		error_code=yaffs_get_error();
 		if (abs(error_code)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lstat_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lstat_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lstat_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lstat_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_lstat_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_lstat_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_lstat_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_EEXIST.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_EEXIST.c
similarity index 71%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_EEXIST.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_EEXIST.c
index 2d94fa4..5c99800 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_EEXIST.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_EEXIST.c
@@ -19,19 +19,12 @@ int test_yaffs_mkdir_EEXIST(void)
 {
 	int error_code = 0;
 	
-	if (0==yaffs_access(DIR_PATH,0)){
-		/* if the file exists  then the file does not need to be created the first time*/
-		
-	} else {
-	
-		output = yaffs_mkdir(DIR_PATH,O_CREAT | O_RDWR);
-		if (output <0) {
-			print_message("failed to create the directory the first time\n",2);
-			return -1;
-		}
+	output = yaffs_mkdir(DIR_PATH,O_CREAT | O_RDWR);
+	if (output <0) {
+		print_message("failed to create the directory the first time\n",2);
+		return -1;
 	}
-
-	output = yaffs_mkdir("/yaffs2/new_directory/",O_CREAT | O_RDWR);
+	output = yaffs_mkdir("/yaffs2/test_dir/new_directory/",O_CREAT | O_RDWR);
 	if (output < 0){
 		error_code = yaffs_get_error();
 		if (abs(error_code) == EEXIST){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_EEXIST.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_EEXIST.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_EEXIST.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_EEXIST.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENOTDIR.c
similarity index 82%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENOTDIR.c
index c417bb3..709e3ed 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENOTDIR.c
@@ -19,8 +19,11 @@ int test_yaffs_mkdir_ENOTDIR(void)
 {
 	int error_code = 0;
 	
-
-	output = yaffs_mkdir("/yaffs2/foo/new_directory/",O_CREAT | O_RDWR);
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output = yaffs_mkdir("/yaffs2/test_dir/foo/new_directory/",O_CREAT | O_RDWR);
 	if (output < 0){
 		error_code = yaffs_get_error();
 		if (abs(error_code) == ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_EROFS.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_EROFS.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mkdir_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mkdir_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mkdir_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount.c
similarity index 93%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount.c
index 42f12ba..d1e4d57 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_mount.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount.c
@@ -17,6 +17,8 @@ int test_yaffs_mount(void)
 {
 	int output = 0;
 	output = yaffs_mount(YAFFS_MOUNT_POINT);
+	yaffs_mkdir(TEST_DIR,S_IWRITE | S_IREAD);
+
 	return output;
 }
 
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount2_ENODEV.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount2_ENODEV.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount2_ENODEV.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount2_ENODEV.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount2_ENODEV.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount2_ENODEV.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount2_ENODEV.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount2_ENODEV.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount_EBUSY.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_EBUSY.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount_EBUSY.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_EBUSY.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount_EBUSY.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_EBUSY.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount_EBUSY.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_EBUSY.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount_ENODEV.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_ENODEV.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount_ENODEV.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_ENODEV.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount_ENODEV.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_ENODEV.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount_ENODEV.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_ENODEV.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_mount_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_mount_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_mount_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EACCES.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EACCES.c
similarity index 93%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EACCES.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EACCES.c
index c3d9a71..c333c3f 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_EACCES.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EACCES.c
@@ -20,7 +20,10 @@ int test_yaffs_open_EACCES(void)
 	int error_code=0;
 	int output =-1;
 	if (yaffs_access(FILE_PATH,0)!=0){
-		output=yaffs_close(test_yaffs_open());
+		
+		handle = yaffs_open(FILE_PATH, O_CREAT | O_RDWR, FILE_MODE);
+
+		output=yaffs_close(handle);
 		if (output<0){
 			print_message("failed to open file\n",2);
 			return -1;
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EACCES.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EACCES.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EACCES.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EACCES.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
similarity index 93%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
index 922f431..4e5a2a4 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EEXIST.c
@@ -18,6 +18,7 @@ static int handle = -1;
 int test_yaffs_open_EEXIST(void)
 {
 	int error_code = 0;
+	handle = yaffs_open(FILE_PATH, O_CREAT | O_EXCL | O_TRUNC| O_RDWR ,FILE_MODE );
 
 	handle = yaffs_open(FILE_PATH, O_CREAT | O_EXCL | O_TRUNC| O_RDWR ,FILE_MODE );
 	if (handle == -1){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EEXIST.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EEXIST.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EEXIST.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EINVAL.c
similarity index 95%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EINVAL.c
index c1f6c90..7729369 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EINVAL.c
@@ -18,6 +18,7 @@ static int handle = -1;
 int test_yaffs_open_EINVAL(void)
 {
 	int error_code = 0;
+	handle = yaffs_open(FILE_PATH, O_CREAT | O_RDWR, FILE_MODE);
 
 	handle=yaffs_open(FILE_PATH, 255,FILE_MODE);
 	if (handle == -1){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EINVAL2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EINVAL2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EINVAL2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EINVAL2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EINVAL2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EISDIR.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EISDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EISDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EISDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ELOOP.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ELOOP.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_ELOOP.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ELOOP.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ELOOP.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ELOOP.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_ELOOP.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ELOOP.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.c
similarity index 87%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.c
index 4ec6a74..6b0fc98 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.c
@@ -18,8 +18,9 @@ static int handle = -1;
 int test_yaffs_open_ENOTDIR(void)
 {
 	int error_code=0;
+	handle = yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE);
 
-	handle=yaffs_open("/yaffs2/foo/file", O_TRUNC| O_RDWR,FILE_MODE );
+	handle=yaffs_open("/yaffs2/test_dir/foo/file", O_TRUNC| O_RDWR,FILE_MODE );
 	if (handle <0){
 		error_code=yaffs_get_error();
 		if (abs(error_code)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EROFS.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EROFS.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_open_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_open_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_open_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_read.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_read.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_read.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_read.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_read.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_read.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_read_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_read_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_read_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_read_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_read_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_read_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_read_EINVAL.c
similarity index 92%
rename from direct/timothy_tests/quick_tests/test_yaffs_read_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_read_EINVAL.c
index 101c458..75bf704 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_read_EINVAL.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_read_EINVAL.c
@@ -11,6 +11,8 @@
  * published by the Free Software Foundation.
  */
 
+/*this is no longer relevent because it is not possiable to read -1 bytes*/
+
 #include "test_yaffs_read_EINVAL.h"
 
 static int handle = -1;
@@ -19,10 +21,14 @@ static char *file_name = NULL;
 int test_yaffs_read_EINVAL(void)
 {
 	int error_code = 0;
-	handle=yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE);
 	char text[2000000];
 	int output=0;	
-	
+	/*if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file before remounting\n",1);
+		return -1;
+	}*/
+	handle=yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE);
+
 	if (handle<0){
 		print_message("could not open file\n",2);
 		return -1;
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_read_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_read_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_read_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_read_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_ENODEV.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_ENODEV.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_ENODEV.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_ENODEV.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_ENODEV.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_ENODEV.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_ENODEV.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_ENODEV.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_off.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_off.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_off.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_off.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_off.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_off.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_off.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_off.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_on.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_on.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_on.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_on.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_on.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_on.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_on.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_off_read_only_on.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_off.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_off.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_off.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_off.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_off.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_off.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_off.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_off.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_on.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_on.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_on.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_on.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_on.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_on.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_on.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_remount_force_on_read_only_on.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.c
similarity index 90%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.c
index c5e2a26..82d29bb 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.c
@@ -18,7 +18,10 @@ int test_yaffs_rename_EEXISTS(void)
 {
 	int output=0;
 	int error_code =0;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	if (0 !=  yaffs_access(DIR_PATH,0)) {
 		output = yaffs_mkdir(DIR_PATH,S_IWRITE | S_IREAD);
 		if (output < 0) {
@@ -36,7 +39,7 @@ int test_yaffs_rename_EEXISTS(void)
 			}
 		}
 	}
-	output= yaffs_open("/yaffs2/dir2/file",O_CREAT | O_RDWR, FILE_MODE);
+	output= yaffs_open("/yaffs2/test_dir/dir2/file",O_CREAT | O_RDWR, FILE_MODE);
 	if (output<0){
 		print_message("failed to open file in the second directory\n",2);
 		return -1;
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EEXISTS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EINVAL.c
similarity index 86%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EINVAL.c
index a430577..d1bb6bd 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_EINVAL.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EINVAL.c
@@ -18,7 +18,10 @@ int test_yaffs_rename_EINVAL(void)
 {
 	int output=0;
 	int error_code =0;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	if (0 !=  yaffs_access(DIR_PATH,0)) {
 		output = yaffs_mkdir(DIR_PATH,S_IWRITE | S_IREAD);
 		if (output < 0) {
@@ -26,7 +29,7 @@ int test_yaffs_rename_EINVAL(void)
 			return -1;
 		}
 	}
-	output = yaffs_rename(DIR_PATH , "/yaffs2/new_directory/dir/");
+	output = yaffs_rename(DIR_PATH , "/yaffs2/test_dir/new_directory/dir/");
 	if (output<0){ 
 		error_code=yaffs_get_error();
 		if (abs(error_code)==EINVAL){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENAMETOOLONG2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTDIR.c
similarity index 86%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTDIR.c
index 7252638..210a08b 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTDIR.c
@@ -18,7 +18,10 @@ int test_yaffs_rename_ENOTDIR(void)
 {
 	int output=0;
 	int error_code =0;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	if (0 !=  yaffs_access(DIR_PATH,0)) {
 		output = yaffs_mkdir(DIR_PATH,S_IWRITE | S_IREAD);
 		if (output < 0) {
@@ -26,7 +29,7 @@ int test_yaffs_rename_ENOTDIR(void)
 			return -1;
 		}
 	}
-	output = yaffs_rename("yaffs2/foo/file" , RENAME_PATH);
+	output = yaffs_rename("yaffs2/test_dir/foo/file" , RENAME_PATH);
 	if (output<0){ 
 		error_code=yaffs_get_error();
 		if (abs(error_code)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTDIR.h
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTEMPTY.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTEMPTY.c
new file mode 100644
index 0000000..a13ee8a
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTEMPTY.c
@@ -0,0 +1,59 @@
+/*
+ * 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 Timothy Manning <timothy@yaffs.net>
+ *
+ * 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.
+ */
+
+
+#include "test_yaffs_rename_ENOTEMPTY.h"
+
+int  test_yaffs_rename_ENOTEMPTY(void)
+{
+
+	int output=0;
+	int error_code =0;
+
+	if (yaffs_mkdir(DIR_PATH,O_CREAT | O_RDWR)==-1){
+		print_message("failed to create dir\n",1);
+		return -1;
+	}
+	if (yaffs_mkdir(DIR_PATH2,O_CREAT | O_RDWR)==-1){
+		print_message("failed to create dir2\n",1);
+		return -1;
+	}
+	if (yaffs_close(yaffs_open(DIR_PATH2_FILE,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output = yaffs_rename( DIR_PATH,DIR_PATH2 );
+	if (output<0){ 
+		error_code=yaffs_get_error();
+		if (abs(error_code)==ENOTEMPTY){
+			return 1;
+		} else {
+			print_message("different error than expected\n",2);
+			return -1;
+		}
+		print_message("could not rename a directory over a nonempty directory (which is a bad thing)\n",2);
+		return -1;
+	} 
+		
+	return 1;
+
+}
+
+
+int  test_yaffs_rename_ENOTEMPTY_clean(void)
+{
+	return 1;
+}
+
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTEMPTY.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTEMPTY.h
new file mode 100644
index 0000000..10b634d
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_ENOTEMPTY.h
@@ -0,0 +1,25 @@
+/*
+ * 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 Timothy Manning <timothy@yaffs.net>
+ *
+ * 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 __TEST_YAFFS_RENAME_ENOTEMPTY_H__
+#define __TEST_YAFFS_RENAME_ENOTEMPTY_H__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_rename_ENOTEMPTY(void);
+int test_yaffs_rename_ENOTEMPTY_clean(void);
+
+#endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EROFS.c
similarity index 91%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EROFS.c
index 768a2d6..f9821d2 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_EROFS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EROFS.c
@@ -18,6 +18,10 @@ int test_yaffs_rename_EROFS(void)
 {
 	int output=0;
 	int error_code =0;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	EROFS_setup();
 	output = yaffs_rename(FILE_PATH , RENAME_PATH);
 	if (output<0){ 
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_NULL2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_NULL2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_NULL2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_NULL2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_NULL2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_NULL2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_NULL2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_NULL2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir.c
similarity index 95%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir.c
index 70e3db7..18a28e6 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir.c
@@ -13,7 +13,7 @@
 
 #include "test_yaffs_rename_dir.h"
 
-
+/*creates a new directory and renames it*/
 int test_yaffs_rename_dir(void)
 {
 	int output=0;
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT.c
similarity index 96%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT.c
index f86b705..059e0b9 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT.c
@@ -13,7 +13,7 @@
 
 #include "test_yaffs_rename_dir_ENOENT.h"
 
-
+/*tries to rename a nonexisting directory */
 int test_yaffs_rename_dir_ENOENT(void)
 {
 	int output=0;
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT2.c
similarity index 84%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT2.c
index a47e2c5..2e2cb28 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT2.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT2.c
@@ -20,13 +20,13 @@ int test_yaffs_rename_dir_ENOENT2(void)
 	int error_code =0;
 
 	if (0 !=  yaffs_access(DIR_PATH,0)) {
-		output = mkdir(DIR_PATH,S_IREAD | S_IWRITE);
+		output = yaffs_mkdir(DIR_PATH,S_IREAD | S_IWRITE);
 		if (output < 0) {
 			print_message("failed to create dir\n",2);
 			return -1;
 		}
 	}
-	output = yaffs_rename( DIR_PATH , "/yaffs2/nonexisting-dir/dir");
+	output = yaffs_rename( DIR_PATH , "/yaffs2/test_dir/nonexisting-dir/dir");
 	if (output<0){ 
 		error_code=yaffs_get_error();
 		if (abs(error_code)==ENOENT){
@@ -36,7 +36,7 @@ int test_yaffs_rename_dir_ENOENT2(void)
 			return -1;
 		}
 	} else{
-		print_message("removed /yaffs2/ directory (which is a bad thing)\n",2);
+		print_message("removed /yaffs2/test_dir/ directory (which is a bad thing)\n",2);
 		return -1;
 	}	
 
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_ENOENT2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.c
similarity index 97%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.c
index 9b37209..bc6f01f 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.c
@@ -13,7 +13,7 @@
 
 #include "test_yaffs_rename_dir.h"
 
-
+/*tests renaming a non empty file */
 int test_yaffs_rename_dir(void)
 {
 	int output=0;
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_not_empty.h
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_over_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_over_dir.c
new file mode 100644
index 0000000..1a46919
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_over_dir.c
@@ -0,0 +1,48 @@
+/*
+ * 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 Timothy Manning <timothy@yaffs.net>
+ *
+ * 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.
+ */
+
+
+#include "test_yaffs_rename_dir_over_dir.h"
+
+int  test_yaffs_rename_dir_over_dir(void)
+{
+
+	int output=0;
+	int error_code =0;
+
+	if (yaffs_mkdir(DIR_PATH,O_CREAT | O_RDWR)==-1){
+		print_message("failed to create dir\n",1);
+		return -1;
+	}
+	if (yaffs_mkdir(DIR_PATH2,O_CREAT | O_RDWR)==-1){
+		print_message("failed to create dir2\n",1);
+		return -1;
+	}
+	output = yaffs_rename(DIR_PATH ,DIR_PATH2 );
+	if (output<0){ 
+		print_message("could not rename a directory over a empty directory (which is a bad thing)\n",2);
+		return -1;
+	} 
+		
+	return 1;
+
+}
+
+
+int  test_yaffs_rename_dir_over_dir_clean(void)
+{
+	return 1;
+}
+
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_over_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_over_dir.h
new file mode 100644
index 0000000..e1ebd15
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_over_dir.h
@@ -0,0 +1,25 @@
+/*
+ * 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 Timothy Manning <timothy@yaffs.net>
+ *
+ * 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 __TEST_YAFFS_RENAME_DIR_OVER_DIR_H__
+#define __TEST_YAFFS_RENAME_DIR_OVER_DIR_H__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_rename_dir_over_dir(void);
+int test_yaffs_rename_dir_over_dir_clean(void);
+
+#endif
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
similarity index 63%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
index b191dbb..5fabdd2 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.c
@@ -13,32 +13,35 @@
 
 #include "test_yaffs_rename_dir_to_file.h"
 
-
+/*tries to rename a directory over an existing file */
 int test_yaffs_rename_dir_to_file(void)
 {
 	int output=0;
-
+	int error_code=0;
 	if (0 !=  yaffs_access(DIR_PATH,0)) {
 		output= yaffs_mkdir(DIR_PATH,(S_IREAD | S_IWRITE));
 		if (output<0) {
-			print_message("failed to remove directory\n",2);
+			print_message("failed to create directory\n",2);
 			return -1;
 		}
 	}
-	if (0 !=  yaffs_access(RENAME_PATH,0)) {
-		output= yaffs_mkdir(RENAME_PATH,(S_IREAD | S_IWRITE));
-		if (output<0) {
-			print_message("failed to remove file\n",2);
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output = yaffs_rename( DIR_PATH , FILE_PATH);
+	if (output==-1){
+		error_code=yaffs_get_error();
+		if (abs(error_code)==ENOTDIR){
+			return 1;
+		} else {
+			print_message("different error than expected\n",2);
 			return -1;
 		}
-	}
-	output = yaffs_rename( DIR_PATH , RENAME_PATH);
-	if (output<0){ 
-		print_message("failed to rename a file over an empty directory\n",2);
+	} else {
+		print_message("renamed a directory over file.(which is a bad thing)\n",2);
 		return -1;
-	} else{
-		return 1;
-	}	
+	}
 
 }
 
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_dir_to_file.h
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_over_file.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_over_file.c
new file mode 100644
index 0000000..70652d6
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_over_file.c
@@ -0,0 +1,48 @@
+/*
+ * 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 Timothy Manning <timothy@yaffs.net>
+ *
+ * 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.
+ */
+
+
+#include "test_yaffs_rename_file_over_file.h"
+
+int  test_yaffs_rename_file_over_file(void)
+{
+
+	int output=0;
+	int error_code =0;
+
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	if (yaffs_close(yaffs_open(FILE_PATH2,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output = yaffs_rename(FILE_PATH ,FILE_PATH2 );
+	if (output<0){ 
+		print_message("could not rename a file over a file (which is a bad thing)\n",2);
+		return -1;
+	} 
+		
+	return 1;
+
+}
+
+
+int  test_yaffs_rename_file_over_file_clean(void)
+{
+	return 1;
+}
+
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_over_file.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_over_file.h
new file mode 100644
index 0000000..ce99b00
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_over_file.h
@@ -0,0 +1,25 @@
+/*
+ * 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 Timothy Manning <timothy@yaffs.net>
+ *
+ * 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 __test_yaffs_RENAME_FILE_OVER_FILE_H__
+#define __test_yaffs_RENAME_FILE_OVER_FILE_H__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_rename_file_over_file(void);
+int test_yaffs_rename_file_over_file_clean(void);
+
+#endif
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_to_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_to_dir.c
new file mode 100644
index 0000000..fec2bf0
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_to_dir.c
@@ -0,0 +1,58 @@
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Timothy Manning <timothy@yaffs.net>
+ *
+ * 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 "test_yaffs_rename_file_to_dir.h"
+
+
+int test_yaffs_rename_file_to_dir(void)
+{
+
+	int output=0;
+	int error_code=0;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+
+	if (0 !=  yaffs_access(RENAME_DIR_PATH,0)) {
+		output = yaffs_mkdir(RENAME_DIR_PATH,S_IWRITE | S_IREAD);
+		if (output < 0) {
+			print_message("failed to create directory\n",2);
+			return -1;
+		}
+	}
+	output=yaffs_rename(FILE_PATH,RENAME_DIR_PATH);
+	if (output==-1){
+		error_code=yaffs_get_error();
+		if (abs(error_code)==EISDIR){
+			return 1;
+		} else {
+			print_message("different error than expected\n",2);
+			return -1;
+		}
+	} else {
+		print_message("renamed a file over a directory (which is a bad thing)\n",2);
+		return -1;
+	}
+	return 1;
+
+}
+
+
+int test_yaffs_rename_file_to_dir_clean(void)
+{
+	
+	return 1;
+
+}
+
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_file_to_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_to_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rename_file_to_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_file_to_dir.h
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_full_dir_over_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_full_dir_over_dir.c
new file mode 100644
index 0000000..64317ce
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_full_dir_over_dir.c
@@ -0,0 +1,52 @@
+/*
+ * 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 Timothy Manning <timothy@yaffs.net>
+ *
+ * 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.
+ */
+
+
+#include "test_yaffs_rename_full_dir_over_dir.h"
+
+int  test_yaffs_rename_full_dir_over_dir(void)
+{
+
+	int output=0;
+	int error_code =0;
+
+	if (yaffs_mkdir(DIR_PATH,O_CREAT | O_RDWR)==-1){
+		print_message("failed to create dir\n",1);
+		return -1;
+	}
+	if (yaffs_mkdir(DIR_PATH2,O_CREAT | O_RDWR)==-1){
+		print_message("failed to create dir2\n",1);
+		return -1;
+	}
+	if (yaffs_close(yaffs_open(DIR_PATH2_FILE,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output = yaffs_rename( DIR_PATH2,DIR_PATH );
+	if (output<0){ 
+		print_message("could not rename a directory over a empty directory (which is a bad thing)\n",2);
+		return -1;
+	} 
+		
+	return 1;
+
+}
+
+
+int  test_yaffs_rename_full_dir_over_dir_clean(void)
+{
+	return 1;
+}
+
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_full_dir_over_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_full_dir_over_dir.h
new file mode 100644
index 0000000..dfee3cd
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_full_dir_over_dir.h
@@ -0,0 +1,25 @@
+/*
+ * 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 Timothy Manning <timothy@yaffs.net>
+ *
+ * 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 __TEST_YAFFS_RENAME_FULL_DIR_OVER_DIR_H__
+#define __TEST_YAFFS_RENAME_FULL_DIR_OVER_DIR_H__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_rename_full_dir_over_dir(void);
+int test_yaffs_rename_full_dir_over_dir_clean(void);
+
+#endif
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_to_null_file.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_to_null_file.c
new file mode 100644
index 0000000..ba04a4f
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_to_null_file.c
@@ -0,0 +1,50 @@
+/*
+ * 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 Timothy Manning <timothy@yaffs.net>
+ *
+ * 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.
+ */
+
+
+#include "test_yaffs_rename_to_null_file.h"
+
+int  test_yaffs_rename_to_null_file(void)
+{
+	int output=0;
+	int error_code =0;
+
+	if (0 !=  yaffs_access(DIR_PATH,0)) {
+		output = yaffs_mkdir(DIR_PATH,S_IWRITE | S_IREAD);
+		if (output < 0) {
+			print_message("failed to create directory\n",2);
+			return -1;
+		}
+	}
+	output = yaffs_rename(FILE_PATH , NULL);
+	if (output<0){ 
+		error_code=yaffs_get_error();
+		if (abs(error_code)==EFAULT){
+			return 1;
+		} else {
+			print_message("returned error does not match the the expected error\n",2);
+			return -1;
+		}
+	} else{
+		print_message("renamed to null path (which is a bad thing)\n",2);
+		return -1;
+	}	
+}
+
+
+int  test_yaffs_rename_to_null_file_clean(void)
+{
+	return 1;
+}
diff --git a/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_to_null_file.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_to_null_file.h
new file mode 100644
index 0000000..0858ecf
--- /dev/null
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rename_to_null_file.h
@@ -0,0 +1,11 @@
+#ifndef __test_yaffs_rename_NULL3_h__
+#define __test_yaffs_rename_NULL3_h__
+
+#include "lib.h"
+#include "yaffsfs.h"
+
+int test_yaffs_rename_to_null_file(void);
+int test_yaffs_rename_to_null_file_clean(void);
+
+#endif
+
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_EBUSY.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EBUSY.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_EBUSY.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EBUSY.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_EBUSY.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EBUSY.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_EBUSY.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EBUSY.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTDIR.c
similarity index 87%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTDIR.c
index 45f5685..412bd3d 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTDIR.c
@@ -18,7 +18,10 @@ int test_yaffs_rmdir_ENOTDIR(void)
 {
 	int output=0;
 	int error_code =0;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	if (0 !=  yaffs_access(DIR_PATH,0)) {
 		output = yaffs_mkdir(DIR_PATH,S_IWRITE | S_IREAD);
 		if (output < 0) {
@@ -26,7 +29,7 @@ int test_yaffs_rmdir_ENOTDIR(void)
 			return -1;
 		}
 	}
-	output = yaffs_rmdir("/yaffs2/foo/dir/");
+	output = yaffs_rmdir("/yaffs2/test_dir/foo/dir/");
 	if (output<0){ 
 		error_code=yaffs_get_error();
 		if (abs(error_code)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.c
similarity index 78%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.c
index 6b8c046..5d881b0 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.c
@@ -18,7 +18,10 @@ int test_yaffs_rmdir_ENOTEMPTY(void)
 {
 	int output=0;
 	int error_code =0;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
 	if (0 !=  yaffs_access(DIR_PATH,0)) {
 		output = yaffs_mkdir(DIR_PATH,S_IWRITE | S_IREAD);
 		if (output < 0) {
@@ -26,8 +29,8 @@ int test_yaffs_rmdir_ENOTEMPTY(void)
 			return -1;
 		}
 	}
-	if (0 !=  yaffs_access("/yaffs2/new_directory/dir",0)) {
-		output = yaffs_mkdir("/yaffs2/new_directory/dir",S_IWRITE | S_IREAD);
+	if (0 !=  yaffs_access("/yaffs2/test_dir/new_directory/dir",0)) {
+		output = yaffs_mkdir("/yaffs2/test_dir/new_directory/dir",S_IWRITE | S_IREAD);
 		if (output < 0) {
 			print_message("failed to create directory\n",2);
 			return -1;
@@ -53,8 +56,8 @@ int test_yaffs_rmdir_ENOTEMPTY_clean(void)
 {
 	int output = -1;
 	int output2 = -1;
-	if (0 ==  yaffs_access("/yaffs2/new_directory/dir",0)) {
-		output = yaffs_rmdir("/yaffs2/new_directory/dir");
+	if (0 ==  yaffs_access("/yaffs2/test_dir/new_directory/dir",0)) {
+		output = yaffs_rmdir("/yaffs2/test_dir/new_directory/dir");
 		if (output < 0) {
 			print_message("failed to remove the directory\n",2);
 			output=1;
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_ENOTEMPTY.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EROFS.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EROFS.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rmdir_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_rmdir_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_rmdir_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat.c
similarity index 89%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat.c
index f3aa8f7..5b5cd31 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_stat.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat.c
@@ -20,7 +20,10 @@ int test_yaffs_stat(void)
 	int size=0;
 	message[0]='\0';
 	struct yaffs_stat stat;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file \n",1);
+		return -1;
+	}
 	return yaffs_stat(FILE_PATH, &stat);
 }
 
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ELOOP.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ELOOP.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ELOOP.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ELOOP.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ELOOP.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ELOOP.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ELOOP.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ELOOP.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ENOENT2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOENT2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ENOENT2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOENT2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ENOENT2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOENT2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ENOENT2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOENT2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOTDIR.c
similarity index 82%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOTDIR.c
index c6773d3..ce22805 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_stat_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOTDIR.c
@@ -20,7 +20,11 @@ int test_yaffs_stat_ENOTDIR(void)
 	int output=0;
 	char text[100];
 	text[0] ='\0';
-	output=yaffs_stat("/yaffs2/foo/file", &stat);;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output=yaffs_stat("/yaffs2/test_dir/foo/file", &stat);;
 	if (output<0){ 
 		error_code=yaffs_get_error();
 		if (abs(error_code)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_stat_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_stat_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_stat_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_EEXIST.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_EEXIST.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_EEXIST.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_EEXIST.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_EEXIST.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_EEXIST.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_EEXIST.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_EEXIST.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOENT2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOTDIR.c
similarity index 83%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOTDIR.c
index 680f0aa..9bb9bb6 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOTDIR.c
@@ -18,7 +18,11 @@ static int output = 0;
 int test_yaffs_symlink_ENOTDIR(void)
 {
 	int error_code = 0;
-	output = yaffs_symlink(FILE_PATH,"yaffs2/foo/sym_link");
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file\n",1);
+		return -1;
+	}
+	output = yaffs_symlink(FILE_PATH,"yaffs2/test_dir/foo/sym_link");
 	if (output<0){ 
 		error_code=yaffs_get_error();
 		if (abs(error_code)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_NULL2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_NULL2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_NULL2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_NULL2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_symlink_NULL2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_NULL2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_symlink_NULL2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_symlink_NULL2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_sync.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_sync.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_sync.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_sync.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_sync_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_sync_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_sync_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_sync_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_sync_ENODEV.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_ENODEV.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_sync_ENODEV.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_ENODEV.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_sync_ENODEV.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_ENODEV.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_sync_ENODEV.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_ENODEV.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_sync_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_EROFS.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_sync_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_EROFS.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_sync_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_sync_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_sync_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_sync_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_sync_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_sync_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_sync_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_totalspace.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_totalspace.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_totalspace.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_totalspace.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_totalspace_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_totalspace_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_totalspace_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_totalspace_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_totalspace_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_totalspace_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_totalspace_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_totalspace_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_totalspace_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_totalspace_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_totalspace_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_totalspace_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_totalspace_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.c
similarity index 82%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.c
index 6e6ef40..b535039 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.c
@@ -18,8 +18,11 @@ int test_yaffs_truncate_EINVAL(void)
 {
 	int error=0;
 	int output=0;
-
-	output= yaffs_truncate("/yaffs2/foo",-1 );
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file \n",1);
+		return -1;
+	}
+	output= yaffs_truncate(FILE_PATH,-1 );
 	if (output<0){
 		error=yaffs_get_error();
 		if (abs(error)==EINVAL){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EISDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOENT2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.c
similarity index 79%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.c
index a2d010f..ce621a0 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.c
@@ -19,9 +19,12 @@ int test_yaffs_truncate_ENOTDIR(void)
 {
 	int error=0;
 	int output=0;
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file \n",1);
+		return -1;
+	}
 
-
-	output= yaffs_truncate("/yaffs2/foo/file",FILE_SIZE_TRUNCATED );
+	output= yaffs_truncate("/yaffs2/test_dir/foo/file",FILE_SIZE_TRUNCATED );
 	if (output<0){
 		error=yaffs_get_error();
 		if (abs(error)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EROFS.c
similarity index 87%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EROFS.c
index 2840a67..6b4b526 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EROFS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EROFS.c
@@ -19,7 +19,10 @@ int test_yaffs_truncate_EROFS(void)
 {
 	int error=0;
 	int output=0;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file \n",1);
+		return -1;
+	}
 
 	EROFS_setup();
 	output= yaffs_truncate(FILE_PATH,FILE_SIZE_TRUNCATED );
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_big_file.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_big_file.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_big_file.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_big_file.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_truncate_big_file.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_big_file.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_truncate_big_file.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_truncate_big_file.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink.c
similarity index 83%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink.c
index f45b595..cffdb25 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_unlink.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink.c
@@ -15,6 +15,10 @@
 
 int test_yaffs_unlink(void)
 {
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file before remounting\n",1);
+		return -1;
+	}
 	int output=yaffs_unlink(FILE_PATH);
 	if (output>=0){
 		return (-test_yaffs_access());	/*return negative access. we do not want the file to be there*/
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_EISDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ELOOP_dir.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ELOOP_dir.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_ELOOP_dir.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ELOOP_dir.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ELOOP_dir.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ELOOP_dir.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_ELOOP_dir.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ELOOP_dir.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOENT2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.c
similarity index 80%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.c
index e75d121..89bace3 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.c
@@ -18,8 +18,11 @@ int test_yaffs_unlink_ENOTDIR(void)
 {
 	int output=0;
 	int error_code=0;
-
-	output=yaffs_unlink("/yaffs2/foo/file");
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file before remounting\n",1);
+		return -1;
+	}
+	output=yaffs_unlink("/yaffs2/test_dir/foo/file");
 	if (output==-1){
 		error_code=yaffs_get_error();
 		if (abs(error_code)==ENOTDIR){
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_ENOTDIR.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.c
similarity index 86%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.c
index 7e1d602..152ef39 100644
--- a/direct/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.c
+++ b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.c
@@ -18,7 +18,10 @@ int test_yaffs_unlink_EROFS(void)
 {
 
 	int error_code=0;
-
+	if (yaffs_close(yaffs_open(FILE_PATH,O_CREAT | O_RDWR, FILE_MODE))==-1){
+		print_message("failed to create file before remounting\n",1);
+		return -1;
+	}
 	EROFS_setup();
 
 	output=yaffs_unlink(FILE_PATH);
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unlink_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unlink_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unlink_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount2.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount2.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount2.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount2.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount2_EINVAL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_EINVAL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount2_EINVAL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_EINVAL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount2_EINVAL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_EINVAL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount2_EINVAL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_EINVAL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount2_ENODEV.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_ENODEV.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount2_ENODEV.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_ENODEV.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount2_ENODEV.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_ENODEV.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount2_ENODEV.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_ENODEV.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_off.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_off.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_off.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_off.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_off.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_off.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_off.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_off.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_on.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_on.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_on.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_on.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_on.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_on.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_on.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount2_with_handle_open_and_forced_mode_on.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount_EBUSY.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_EBUSY.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount_EBUSY.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_EBUSY.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount_EBUSY.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_EBUSY.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount_EBUSY.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_EBUSY.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount_ENAMETOOLONG.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_ENAMETOOLONG.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount_ENAMETOOLONG.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_ENAMETOOLONG.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount_ENAMETOOLONG.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_ENAMETOOLONG.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount_ENAMETOOLONG.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_ENAMETOOLONG.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount_ENODEV.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_ENODEV.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount_ENODEV.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_ENODEV.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount_ENODEV.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_ENODEV.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount_ENODEV.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_ENODEV.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount_NULL.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_NULL.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount_NULL.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_NULL.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_unmount_NULL.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_NULL.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_unmount_NULL.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_unmount_NULL.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_write.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_write.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_write.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_write.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_write.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_write.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write_EBADF.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_EBADF.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_write_EBADF.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_EBADF.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write_EBADF.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_EBADF.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_write_EBADF.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_EBADF.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write_EROFS.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_EROFS.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_write_EROFS.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_EROFS.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write_EROFS.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_EROFS.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_write_EROFS.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_EROFS.h
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write_big_file.c b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_big_file.c
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_write_big_file.c
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_big_file.c
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_write_big_file.h b/direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_big_file.h
similarity index 100%
rename from direct/timothy_tests/quick_tests/test_yaffs_write_big_file.h
rename to direct/test-framework/timothy_tests/quick_tests/test_yaffs_write_big_file.h
diff --git a/direct/test-framework/timothy_tests/stress_tester/Makefile b/direct/test-framework/timothy_tests/stress_tester/Makefile
new file mode 100644
index 0000000..ce61910
--- /dev/null
+++ b/direct/test-framework/timothy_tests/stress_tester/Makefile
@@ -0,0 +1,41 @@
+# Makefile for stress_tester
+#
+#
+# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
+#
+# Copyright (C) 2003-2010 Aleph One Ltd.
+#
+#
+# Created by Timothy Manning <timothy@aleph1.co.uk>
+#
+# 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.
+#
+# NB Warning this Makefile does not include header dependencies.
+#
+
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
+CLEAN_OBJS = yaffs_tester emfile-2k-0
+
+TESTFILES = 	yaffs_tester.o message_buffer.o error_handler.o 
+
+all: yaffs_tester
+
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
+
+
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
+
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
+
+
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
+
+
+yaffs_tester: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
diff --git a/direct/timothy_tests/stress_tester/README.txt b/direct/test-framework/timothy_tests/stress_tester/README.txt
similarity index 100%
rename from direct/timothy_tests/stress_tester/README.txt
rename to direct/test-framework/timothy_tests/stress_tester/README.txt
diff --git a/direct/timothy_tests/stress_tester/error_handler.c b/direct/test-framework/timothy_tests/stress_tester/error_handler.c
similarity index 100%
rename from direct/timothy_tests/stress_tester/error_handler.c
rename to direct/test-framework/timothy_tests/stress_tester/error_handler.c
diff --git a/direct/timothy_tests/stress_tester/error_handler.h b/direct/test-framework/timothy_tests/stress_tester/error_handler.h
similarity index 100%
rename from direct/timothy_tests/stress_tester/error_handler.h
rename to direct/test-framework/timothy_tests/stress_tester/error_handler.h
diff --git a/direct/timothy_tests/stress_tester/message_buffer.c b/direct/test-framework/timothy_tests/stress_tester/message_buffer.c
similarity index 100%
rename from direct/timothy_tests/stress_tester/message_buffer.c
rename to direct/test-framework/timothy_tests/stress_tester/message_buffer.c
diff --git a/direct/timothy_tests/stress_tester/message_buffer.h b/direct/test-framework/timothy_tests/stress_tester/message_buffer.h
similarity index 100%
rename from direct/timothy_tests/stress_tester/message_buffer.h
rename to direct/test-framework/timothy_tests/stress_tester/message_buffer.h
diff --git a/direct/timothy_tests/stress_tester/yaffs_tester.c b/direct/test-framework/timothy_tests/stress_tester/yaffs_tester.c
similarity index 100%
rename from direct/timothy_tests/stress_tester/yaffs_tester.c
rename to direct/test-framework/timothy_tests/stress_tester/yaffs_tester.c
diff --git a/direct/timothy_tests/stress_tester/yaffs_tester.h b/direct/test-framework/timothy_tests/stress_tester/yaffs_tester.h
similarity index 100%
rename from direct/timothy_tests/stress_tester/yaffs_tester.h
rename to direct/test-framework/timothy_tests/stress_tester/yaffs_tester.h
diff --git a/direct/test-framework/timothy_tests/threading/Makefile b/direct/test-framework/timothy_tests/threading/Makefile
new file mode 100644
index 0000000..471ee56
--- /dev/null
+++ b/direct/test-framework/timothy_tests/threading/Makefile
@@ -0,0 +1,42 @@
+# Makefile for threading
+#
+#
+# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
+#
+# Copyright (C) 2003-2010 Aleph One Ltd.
+#
+#
+# Created by Timothy Manning <timothy@aleph1.co.uk>
+#
+# 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.
+#
+# NB Warning this Makefile does not include header dependencies.
+#
+
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
+CLEAN_OBJS = threading emfile-2k-0
+
+TESTFILES = 	threading.o thread_function.o \
+		test_a.o test_b.o lib.o
+
+all: threading
+
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
+
+
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
+
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
+
+
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
+
+
+threading: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS) -pthread
+
diff --git a/direct/timothy_tests/threading/README.txt b/direct/test-framework/timothy_tests/threading/README.txt
similarity index 100%
rename from direct/timothy_tests/threading/README.txt
rename to direct/test-framework/timothy_tests/threading/README.txt
diff --git a/direct/timothy_tests/threading/lib.c b/direct/test-framework/timothy_tests/threading/lib.c
similarity index 100%
rename from direct/timothy_tests/threading/lib.c
rename to direct/test-framework/timothy_tests/threading/lib.c
diff --git a/direct/timothy_tests/threading/lib.h b/direct/test-framework/timothy_tests/threading/lib.h
similarity index 100%
rename from direct/timothy_tests/threading/lib.h
rename to direct/test-framework/timothy_tests/threading/lib.h
diff --git a/direct/timothy_tests/threading/test_a.c b/direct/test-framework/timothy_tests/threading/test_a.c
similarity index 100%
rename from direct/timothy_tests/threading/test_a.c
rename to direct/test-framework/timothy_tests/threading/test_a.c
diff --git a/direct/timothy_tests/threading/test_a.h b/direct/test-framework/timothy_tests/threading/test_a.h
similarity index 100%
rename from direct/timothy_tests/threading/test_a.h
rename to direct/test-framework/timothy_tests/threading/test_a.h
diff --git a/direct/timothy_tests/threading/test_b.c b/direct/test-framework/timothy_tests/threading/test_b.c
similarity index 100%
rename from direct/timothy_tests/threading/test_b.c
rename to direct/test-framework/timothy_tests/threading/test_b.c
diff --git a/direct/timothy_tests/threading/test_b.h b/direct/test-framework/timothy_tests/threading/test_b.h
similarity index 100%
rename from direct/timothy_tests/threading/test_b.h
rename to direct/test-framework/timothy_tests/threading/test_b.h
diff --git a/direct/timothy_tests/threading/thread_function.c b/direct/test-framework/timothy_tests/threading/thread_function.c
similarity index 100%
rename from direct/timothy_tests/threading/thread_function.c
rename to direct/test-framework/timothy_tests/threading/thread_function.c
diff --git a/direct/timothy_tests/threading/thread_function.h b/direct/test-framework/timothy_tests/threading/thread_function.h
similarity index 100%
rename from direct/timothy_tests/threading/thread_function.h
rename to direct/test-framework/timothy_tests/threading/thread_function.h
diff --git a/direct/timothy_tests/threading/threading.c b/direct/test-framework/timothy_tests/threading/threading.c
similarity index 95%
rename from direct/timothy_tests/threading/threading.c
rename to direct/test-framework/timothy_tests/threading/threading.c
index 96a91f8..7ac4e2e 100644
--- a/direct/timothy_tests/threading/threading.c
+++ b/direct/test-framework/timothy_tests/threading/threading.c
@@ -12,7 +12,6 @@
  */
 
 #include "threading.h"
-
 int random_seed;
 int simulate_power_failure = 0;
 
@@ -61,7 +60,7 @@ int main(int argc, char *argv[])
 	for (x=0;x<get_num_of_threads();x++)
 	{
 		
-		output=pthread_create(&threads[x], NULL,thread_function, (void *)x );
+		output = pthread_create(&threads[x], NULL,thread_function, (void *)x );
 		if (output>0){
 			printf("failed to create thread %d. Error is %d\n",x,output);
 		}
diff --git a/direct/timothy_tests/threading/threading.h b/direct/test-framework/timothy_tests/threading/threading.h
similarity index 100%
rename from direct/timothy_tests/threading/threading.h
rename to direct/test-framework/timothy_tests/threading/threading.h
diff --git a/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/Makefile b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/Makefile
new file mode 100644
index 0000000..f130aa5
--- /dev/null
+++ b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/Makefile
@@ -0,0 +1,45 @@
+# Makefile for mirror_tests
+#
+#
+# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
+#
+# Copyright (C) 2003-2010 Aleph One Ltd.
+#
+#
+# Created by Timothy Manning <timothy@aleph1.co.uk>
+#
+# 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.
+#
+# NB Warning this Makefile does not include header dependencies.
+#
+
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
+CLEAN_OBJS = mirror_tests emfile-2k-0
+
+TESTFILES = 	mirror_tests.o lib.o\
+		linux_test_open.o yaffs_test_open.o\
+		linux_test_truncate.o yaffs_test_truncate.o \
+		linux_test_unlink.o yaffs_test_unlink.o \
+		linux_test_write.o yaffs_test_write.o
+
+all: mirror_tests
+
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
+
+
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
+
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
+
+
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
+
+
+mirror_tests: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
+
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/README.txt b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/README.txt
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/README.txt
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/README.txt
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/lib.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/lib.c
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/lib.c
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/lib.c
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/lib.h b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/lib.h
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/lib.h
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/lib.h
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_open.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_open.c
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_open.c
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_open.c
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_open.h b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_open.h
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_open.h
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_open.h
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_truncate.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_truncate.c
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_truncate.c
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_truncate.c
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_truncate.h b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_truncate.h
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_truncate.h
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_truncate.h
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_unlink.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_unlink.c
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_unlink.c
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_unlink.c
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_unlink.h b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_unlink.h
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_unlink.h
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_unlink.h
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_write.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_write.c
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_write.c
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_write.c
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_write.h b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_write.h
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_write.h
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/linux_test_write.h
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.c
similarity index 99%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.c
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.c
index cd4e5f2..071a313 100644
--- a/direct/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.c
+++ b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.c
@@ -313,7 +313,7 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 	struct yaffs_stat yaffs_stat_struct;
 	struct stat linux_stat_struct;
 	yaffs_DIR *yaffs_open_dir;
-	yaffs_dirent *yaffs_current_file;
+	struct yaffs_dirent *yaffs_current_file;
 	
 	DIR *linux_open_dir;
 	struct dirent *linux_current_file;
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.h b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.h
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.h
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.h
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_open.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_open.c
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_open.c
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_open.c
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_open.h b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_open.h
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_open.h
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_open.h
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_truncate.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_truncate.c
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_truncate.c
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_truncate.c
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_truncate.h b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_truncate.h
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_truncate.h
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_truncate.h
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_unlink.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_unlink.c
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_unlink.c
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_unlink.c
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_unlink.h b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_unlink.h
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_unlink.h
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_unlink.h
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_write.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_write.c
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_write.c
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_write.c
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_write.h b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_write.h
similarity index 100%
rename from direct/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_write.h
rename to direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/yaffs_test_write.h
diff --git a/direct/timothy_tests/handle_tests/Makefile b/direct/timothy_tests/handle_tests/Makefile
deleted file mode 100644
index a2e9a5e..0000000
--- a/direct/timothy_tests/handle_tests/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-# Makefile for YAFFS direct stress tests
-#
-#
-# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
-#
-# Copyright (C) 2003-2010 Aleph One Ltd.
-#
-#
-# Created by Charles Manning <charles@aleph1.co.uk>
-#
-# 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.
-#
-# NB Warning this Makefile does not include header dependencies.
-#
-# $Id: Makefile,v 1.7 2010-02-25 22:34:47 charles Exp $
-
-#EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
-
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  
-CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
-CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing 
-#CFLAGS +=    -fno-strict-aliasing
-CFLAGS +=    -O0
-CFLAGS +=    -Wextra -Wpointer-arith
-#CFLAGS +=    -DCONFIG_YAFFS_VALGRIND_TEST
-
-#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 \
-		 yaffs_error.o	\
-		 yaffs_summary.o
-
-#		 yaffs_checkptrwtest.o\
-
-TESTFILES = 	handle_test.o 
-
-
-		  
-
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) $(TESTFILES)
-
-
-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_checkptrw.h yaffs_checkptrw.c \
-          yaffs_nameval.c yaffs_nameval.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 \
-          yaffs_bitmap.c yaffs_bitmap.h \
-          yaffs_verify.c yaffs_verify.h \
-		  yaffs_summary.c yaffs_summary.h
-
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-		       yaffsfs.h ydirectenv.h \
-		       yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
-		       yaffs_nandemul2k.h yaffs_list.h \
-		       yaffs_attribs.c yaffs_osglue.h \
-		       yaffs_nandif.c yaffs_nandif.h yportenv.h \
-		       yaffs_hweight.h yaffs_hweight.c \
-		       yaffs_error.c
-
-
-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 yaffs_osglue.c
-
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS) $(PYTONOSYMLINKS)
-#all: directtest2k boottest
-
-all: handle_test
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
-
-$(PYTONOSYMLINKS):
-	ln -s ../../python/$@ $@
-
-$(YAFFSSYMLINKS):
-	ln -s ../../../$@ $@
-
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
-
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
-
-
-handle_test: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS)
-
-
-
-clean:
-	rm -f handle_test  $(ALLOBJS) core $(SYMLINKS) 
diff --git a/direct/timothy_tests/is_yaffs_working_tests/Makefile b/direct/timothy_tests/is_yaffs_working_tests/Makefile
deleted file mode 100644
index 8cc1f44..0000000
--- a/direct/timothy_tests/is_yaffs_working_tests/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-# Makefile for YAFFS direct stress tests
-#
-#
-# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
-#
-# Copyright (C) 2003-2010 Aleph One Ltd.
-#
-#
-# Created by Charles Manning <charles@aleph1.co.uk>
-#
-# 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.
-#
-# NB Warning this Makefile does not include header dependencies.
-#
-# $Id: Makefile,v 1.7 2010-02-25 22:34:47 charles Exp $
-
-#EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
-
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  
-CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
-CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing 
-#CFLAGS +=    -fno-strict-aliasing
-CFLAGS +=    -O0
-CFLAGS +=    -Wextra -Wpointer-arith
-#CFLAGS +=    -DCONFIG_YAFFS_VALGRIND_TEST
-
-#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 \
-		 yaffs_error.o	\
-		 yaffs_summary.o
-
-#		 yaffs_checkptrwtest.o\
-
-TESTFILES = 	test_1_yaffs_mount.o 
-
-
-		  
-
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) $(TESTFILES)
-
-
-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_checkptrw.h yaffs_checkptrw.c \
-          yaffs_nameval.c yaffs_nameval.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 \
-          yaffs_bitmap.c yaffs_bitmap.h \
-          yaffs_verify.c yaffs_verify.h \
-		  yaffs_summary.c yaffs_summary.h
-
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-		       yaffsfs.h ydirectenv.h \
-		       yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
-		       yaffs_nandemul2k.h yaffs_list.h \
-		       yaffs_attribs.c yaffs_osglue.h \
-		       yaffs_nandif.c yaffs_nandif.h yportenv.h \
-		       yaffs_hweight.h yaffs_hweight.c \
-		       yaffs_error.c
-
-
-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 yaffs_osglue.c
-
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS) $(PYTONOSYMLINKS)
-#all: directtest2k boottest
-
-all: test_1_yaffs_mount
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
-
-$(PYTONOSYMLINKS):
-	ln -s ../../python/$@ $@
-
-$(YAFFSSYMLINKS):
-	ln -s ../../../$@ $@
-
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
-
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
-
-
-test_1_yaffs_mount: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS)
-
-
-
-clean:
-	rm -f test_1_yaffs_mount  $(ALLOBJS) core $(SYMLINKS) 
diff --git a/direct/timothy_tests/linux_tests/Makefile b/direct/timothy_tests/linux_tests/Makefile
deleted file mode 100644
index c80ef4d..0000000
--- a/direct/timothy_tests/linux_tests/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-# Makefile for YAFFS direct stress tests
-#
-#
-# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
-#
-# Copyright (C) 2003-2010 Aleph One Ltd.
-#
-#
-# Created by Charles Manning <charles@aleph1.co.uk>
-#
-# 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.
-#
-# NB Warning this Makefile does not include header dependencies.
-#
-# $Id: Makefile,v 1.7 2010-02-25 22:34:47 charles Exp $
-
-#EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
-
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  
-CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
-CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing 
-#CFLAGS +=    -fno-strict-aliasing
-CFLAGS +=    -O0
-CFLAGS +=    -Wextra -Wpointer-arith
-#CFLAGS +=    -DCONFIG_YAFFS_VALGRIND_TEST
-
-#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 \
-		 yaffs_error.o  \
-		 yaffs_summary.o
-#		yaffs_tagsvalidity.o
-#		 yaffs_checkptrwtest.o\
-
-TESTFILES = 	linux_test.o lib.o
-		
-
-		  
-
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) $(TESTFILES)
-
-
-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_checkptrw.h yaffs_checkptrw.c \
-          yaffs_nameval.c yaffs_nameval.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 \
-          yaffs_bitmap.c yaffs_bitmap.h \
-          yaffs_verify.c yaffs_verify.h \
-          yaffs_summary.c yaffs_summary.h
-#yaffs_tagsvalidity.c yaffs_tagsvalidity.h
-
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-		       yaffsfs.h ydirectenv.h \
-		       yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
-		       yaffs_nandemul2k.h yaffs_list.h \
-		       yaffs_attribs.c yaffs_osglue.h \
-		       yaffs_nandif.c yaffs_nandif.h yportenv.h \
-		       yaffs_hweight.h yaffs_hweight.c \
-		       yaffs_error.c
-
-
-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 yaffs_osglue.c
-
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS) $(PYTONOSYMLINKS)
-#all: directtest2k boottest
-
-all: linux_test
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
-
-$(PYTONOSYMLINKS):
-	ln -s ../../python/$@ $@
-
-$(YAFFSSYMLINKS):
-	ln -s ../../../$@ $@
-
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
-
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
-
-
-linux_test: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS)
-
-
-
-clean:
-	rm -f linux_test  $(ALLOBJS) core $(SYMLINKS) 
diff --git a/direct/timothy_tests/quick_tests/test_yaffs_rename_file_to_dir.c b/direct/timothy_tests/quick_tests/test_yaffs_rename_file_to_dir.c
deleted file mode 100644
index efc87d0..0000000
--- a/direct/timothy_tests/quick_tests/test_yaffs_rename_file_to_dir.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * YAFFS: Yet another FFS. A NAND-flash specific file system.
- *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Timothy Manning <timothy@yaffs.net>
- *
- * 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 "test_yaffs_rename_file_to_dir.h"
-
-
-int test_yaffs_rename_file_to_dir(void)
-{
-	int output=0;
-
-	if (0 !=  yaffs_access(FILE_PATH,0)) {
-		output = test_yaffs_open();
-		if (output < 0) {
-			print_message("failed to create file\n",2);
-			return -1;
-		} else {
-			output = yaffs_close(output);
-			if (output < 0) {
-				print_message("failed to close file\n",2);
-				return -1;
-			}
-		}
-	}
-	output = yaffs_rename( "/yaffs2/foo" , RENAME_DIR_PATH);
-	if (output<0){ 
-		print_message("failed to rename a file over an empty directory\n",2);
-		return -1;
-	} else{
-		return 1;
-	}	
-
-}
-
-
-int test_yaffs_rename_file_to_dir_clean(void)
-{
-	int output = 0;
-	test_yaffs_open();
-	if (0 ==  yaffs_access(RENAME_DIR_PATH,0)) {
-		output = yaffs_unlink(RENAME_DIR_PATH);
-		if (output < 0) {
-			print_message("failed to unlink the file\n",2);
-			return -1;
-		}
-		output = test_yaffs_open();
-		if (output < 0) {
-			print_message("failed to open a new\n",2);
-			return -1;
-		}
-	}
-	return 1;
-
-}
-
diff --git a/direct/timothy_tests/stress_tester/Makefile b/direct/timothy_tests/stress_tester/Makefile
deleted file mode 100644
index b6d8cf8..0000000
--- a/direct/timothy_tests/stress_tester/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-# Makefile for YAFFS direct stress tests
-#
-#
-# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
-#
-# Copyright (C) 2003-2010 Aleph One Ltd.
-#
-#
-# Created by Charles Manning <charles@aleph1.co.uk>
-#
-# 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.
-#
-# NB Warning this Makefile does not include header dependencies.
-#
-# $Id: Makefile,v 1.7 2010-02-25 22:34:47 charles Exp $
-
-#EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
-
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM -DCONFIG_YAFFS_YAFFS2  
-CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
-CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing 
-#CFLAGS +=    -fno-strict-aliasing
-CFLAGS +=    -O0
-CFLAGS +=    -Wextra -Wpointer-arith
-#CFLAGS +=    -DCONFIG_YAFFS_VALGRIND_TEST
-
-#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 \
-		 yaffs_summary.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_nand.o \
-		 yaffs_attribs.o yaffs_allocator.o \
-		 yaffs_checkptrw.o  yaffs_qsort.o\
-		 yaffs_nameval.o \
-		 yaffs_norif1.o  ynorsim.o   \
-		 yaffs_allocator.o \
-		 yaffs_bitmap.o \
-		 yaffs_yaffs1.o \
-		 yaffs_yaffs2.o \
-		 yaffs_verify.o
-
-#		 yaffs_checkptrwtest.o\
-
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) yaffs_tester.o message_buffer.o error_handler.o
-
-
-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_checkptrw.h yaffs_checkptrw.c \
-          yaffs_nameval.c yaffs_nameval.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 \
-          yaffs_bitmap.c yaffs_bitmap.h \
-          yaffs_verify.c yaffs_verify.h \
-		  yaffs_summary.c yaffs_summary.h
-
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.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 yaffs_osglue.c
-
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS)
-#all: directtest2k boottest
-
-all: yaffs_tester 
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
-
-
-$(YAFFSSYMLINKS):
-	ln -s ../../../$@ $@
-
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
-
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
-
-
-yaffs_tester: $(SYMLINKS) $(YAFFSTESTOBJS)
-	gcc $(CFLLAG) -o $@ $(YAFFSTESTOBJS)
-
-
-
-
-
-
-clean:
-	rm -f yaffs_tester  $(ALLOBJS) core $(SYMLINKS) log.txt 
diff --git a/direct/timothy_tests/threading/Makefile b/direct/timothy_tests/threading/Makefile
deleted file mode 100644
index cb3c1e4..0000000
--- a/direct/timothy_tests/threading/Makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# Makefile for YAFFS direct stress tests
-#
-#
-# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
-#
-# Copyright (C) 2003-2010 Aleph One Ltd.
-#
-#
-# Created by Charles Manning <charles@aleph1.co.uk>
-#
-# 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.
-#
-# NB Warning this Makefile does not include header dependencies.
-#
-# $Id: Makefile,v 1.7 2010-02-25 22:34:47 charles Exp $
-
-#EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
-
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  
-CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
-CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing 
-#CFLAGS +=    -fno-strict-aliasing
-CFLAGS +=    -O0
-CFLAGS +=    -Wextra -Wpointer-arith
-#CFLAGS +=    -DCONFIG_YAFFS_VALGRIND_TEST
-
-#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 \
-		 yaffs_error.o  \
-		 yaffs_summary.o
-
-#		 yaffs_checkptrwtest.o\
-
-TESTFILES = 	threading.o thread_function.o \
-		test_a.o test_b.o lib.o
-
-		  
-
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) $(TESTFILES)
-
-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_checkptrw.h yaffs_checkptrw.c \
-          yaffs_nameval.c yaffs_nameval.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 \
-          yaffs_bitmap.c yaffs_bitmap.h \
-          yaffs_verify.c yaffs_verify.h \
-		  yaffs_summary.c yaffs_summary.h
-
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-		       yaffsfs.h ydirectenv.h \
-		       yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
-		       yaffs_nandemul2k.h yaffs_list.h \
-		       yaffs_attribs.c yaffs_osglue.h \
-		       yaffs_nandif.c yaffs_nandif.h yportenv.h \
-		       yaffs_hweight.h yaffs_hweight.c \
-		       yaffs_error.c
-
-
-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 yaffs_osglue.c
-
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS) $(PYTONOSYMLINKS)
-#all: directtest2k boottest
-
-all: threading
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
-
-$(PYTONOSYMLINKS):
-	ln -s ../../python/$@ $@
-
-$(YAFFSSYMLINKS):
-	ln -s ../../../$@ $@
-
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
-
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
-
-
-threading: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS) -lpthread
-
-
-
-
-
-
-clean:
-	rm -f  threading $(ALLOBJS) core $(SYMLINKS) 
diff --git a/direct/timothy_tests/yaffs_and_linux_mirror_tests/Makefile b/direct/timothy_tests/yaffs_and_linux_mirror_tests/Makefile
deleted file mode 100644
index 0ba8539..0000000
--- a/direct/timothy_tests/yaffs_and_linux_mirror_tests/Makefile
+++ /dev/null
@@ -1,119 +0,0 @@
-# Makefile for YAFFS direct stress tests
-#
-#
-# YAFFS: Yet another Flash File System. A NAND-flash specific file system.
-#
-# Copyright (C) 2003-2010 Aleph One Ltd.
-#
-#
-# Created by Charles Manning <charles@aleph1.co.uk>
-#
-# 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.
-#
-# NB Warning this Makefile does not include header dependencies.
-#
-# $Id: Makefile,v 1.7 2010-02-25 22:34:47 charles Exp $
-
-#EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
-
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  
-CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
-CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing 
-#CFLAGS +=    -fno-strict-aliasing
-CFLAGS +=    -O0
-CFLAGS +=    -Wextra -Wpointer-arith
-#CFLAGS +=    -DCONFIG_YAFFS_VALGRIND_TEST
-
-#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 \
-		 yaffs_error.o	\
-		 yaffs_summary.o
-
-#		 yaffs_checkptrwtest.o\
-
-TESTFILES = 	mirror_tests.o lib.o\
-		linux_test_open.o yaffs_test_open.o\
-		linux_test_truncate.o yaffs_test_truncate.o \
-		linux_test_unlink.o yaffs_test_unlink.o \
-		linux_test_write.o yaffs_test_write.o
-
-
-		  
-
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) $(TESTFILES)
-
-
-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_checkptrw.h yaffs_checkptrw.c \
-          yaffs_nameval.c yaffs_nameval.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 \
-          yaffs_bitmap.c yaffs_bitmap.h \
-          yaffs_verify.c yaffs_verify.h \
-          yaffs_summary.c yaffs_summary.h
-
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-		       yaffsfs.h ydirectenv.h \
-		       yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
-		       yaffs_nandemul2k.h yaffs_list.h \
-		       yaffs_attribs.c yaffs_osglue.h \
-		       yaffs_nandif.c yaffs_nandif.h yportenv.h \
-		       yaffs_hweight.h yaffs_hweight.c \
-		       yaffs_error.c
-
-
-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 yaffs_osglue.c
-
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS) $(PYTONOSYMLINKS)
-#all: directtest2k boottest
-
-all: mirror_tests
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
-
-$(PYTONOSYMLINKS):
-	ln -s ../../python/$@ $@
-
-$(YAFFSSYMLINKS):
-	ln -s ../../../$@ $@
-
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
-
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
-
-
-mirror_tests: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS)
-
-
-
-clean:
-	rm -f mirror_tests  $(ALLOBJS) core $(SYMLINKS) 
diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index a269984..27bc572 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -1482,6 +1482,24 @@ int yaffs_unlink(const YCHAR *path)
 	return yaffsfs_DoUnlink(path, 0);
 }
 
+static int rename_file_over_dir(struct yaffs_obj *obj, struct yaffs_obj *newobj)
+{
+	if (obj && obj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY &&
+	    newobj && newobj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
+		return 1;
+	else
+		return 0;
+}
+
+static int rename_dir_over_file(struct yaffs_obj *obj, struct yaffs_obj *newobj)
+{
+	if (obj && obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
+	    newobj && newobj->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
+		return 1;
+	else
+		return 0;
+}
+
 int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 {
 	struct yaffs_obj *olddir = NULL;
@@ -1551,6 +1569,12 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
 	} else if (obj->my_dev->read_only) {
 		yaffsfs_SetError(-EROFS);
 		rename_allowed = 0;
+	} else if (rename_file_over_dir(obj, newobj)) {
+		yaffsfs_SetError(-EISDIR);
+		rename_allowed = 0;
+	} else if (rename_dir_over_file(obj, newobj)) {
+		yaffsfs_SetError(-ENOTDIR);
+		rename_allowed = 0;
 	} else if (yaffs_is_non_empty_dir(newobj)) {
 		yaffsfs_SetError(-ENOTEMPTY);
 		rename_allowed = 0;
diff --git a/yaffs_guts.h b/yaffs_guts.h
index 26ad54d..64929ed 100644
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -39,7 +39,7 @@
  * 2^(3*MAX_LEVEL+4)
  *
  * Thus a max level of 8 supports files with up to 2^^28 chunks which gives
- * a maximum file size of arounf 51Gbytees with 2k chunks.
+ * a maximum file size of around 512Gbytees with 2k chunks.
  */
 #define YAFFS_NTNODES_LEVEL0		16
 #define YAFFS_TNODES_LEVEL0_BITS	4
diff --git a/yaffs_linux.h b/yaffs_linux.h
index c541e31..c20ab14 100644
--- a/yaffs_linux.h
+++ b/yaffs_linux.h
@@ -31,9 +31,18 @@ struct yaffs_linux_context {
 	struct list_head search_contexts;
 	struct task_struct *readdir_process;
 	unsigned mount_id;
+	int dirty;
 };
 
 #define yaffs_dev_to_lc(dev) ((struct yaffs_linux_context *)((dev)->os_context))
 #define yaffs_dev_to_mtd(dev) ((struct mtd_info *)((dev)->driver_context))
 
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
+#define WRITE_SIZE_STR "writesize"
+#define WRITE_SIZE(mtd) ((mtd)->writesize)
+#else
+#define WRITE_SIZE_STR "oobblock"
+#define WRITE_SIZE(mtd) ((mtd)->oobblock)
+#endif
+
 #endif
diff --git a/yaffs_mtdif.h b/yaffs_mtdif.h
index e5172eb..9cff224 100644
--- a/yaffs_mtdif.h
+++ b/yaffs_mtdif.h
@@ -19,5 +19,7 @@
 #include "yaffs_guts.h"
 
 void yaffs_mtd_drv_install(struct yaffs_dev *dev);
-
+struct mtd_info * yaffs_get_mtd_device(dev_t sdev);
+void yaffs_put_mtd_device(struct mtd_info *mtd);
+int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags);
 #endif
diff --git a/yaffs_mtdif_multi.c b/yaffs_mtdif_multi.c
index e61699d..265dd78 100644
--- a/yaffs_mtdif_multi.c
+++ b/yaffs_mtdif_multi.c
@@ -33,6 +33,16 @@
 #endif
 
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0))
+#define mtd_erase(m, ei) (m)->erase(m, ei)
+#define mtd_write_oob(m, addr, pops) (m)->write_oob(m, addr, pops)
+#define mtd_read_oob(m, addr, pops) (m)->read_oob(m, addr, pops)
+#define mtd_block_isbad(m, offs) (m)->block_isbad(m, offs)
+#define mtd_block_markbad(m, offs) (m)->block_markbad(m, offs)
+#endif
+
+
+
 int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
 {
 	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
@@ -50,7 +60,7 @@ int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
 	ei.callback = NULL;
 	ei.priv = (u_long) dev;
 
-	retval = mtd->erase(mtd, &ei);
+	retval = mtd_erase(mtd, &ei);
 
 	if (retval == 0)
 		return YAFFS_OK;
@@ -76,7 +86,7 @@ static 	int yaffs_mtd_write(struct yaffs_dev *dev, int nand_chunk,
 	ops.datbuf = (u8 *)data;
 	ops.oobbuf = (u8 *)oob;
 
-	retval = mtd->write_oob(mtd, addr, &ops);
+	retval = mtd_write_oob(mtd, addr, &ops);
 	if (retval) {
 		yaffs_trace(YAFFS_TRACE_MTD,
 			"write_oob failed, chunk %d, mtd error %d",
@@ -95,7 +105,7 @@ static int yaffs_mtd_read(struct yaffs_dev *dev, int nand_chunk,
 	struct mtd_oob_ops ops;
 	int retval;
 
-	addr = ((loff_t) nand_chunk) * dev->data_bytes_per_chunk;
+	addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
 	memset(&ops, 0, sizeof(ops));
 	ops.mode = MTD_OPS_AUTO_OOB;
 	ops.len = (data) ? data_len : 0;
@@ -112,7 +122,7 @@ static int yaffs_mtd_read(struct yaffs_dev *dev, int nand_chunk,
 	/* Read page and oob using MTD.
 	 * Check status and determine ECC result.
 	 */
-	retval = mtd->read_oob(mtd, addr, &ops);
+	retval = mtd_read_oob(mtd, addr, &ops);
 	if (retval)
 		yaffs_trace(YAFFS_TRACE_MTD,
 			"read_oob failed, chunk %d, mtd error %d",
@@ -165,7 +175,7 @@ static 	int yaffs_mtd_erase(struct yaffs_dev *dev, int block_no)
 	ei.callback = NULL;
 	ei.priv = (u_long) dev;
 
-	retval = mtd->erase(mtd, &ei);
+	retval = mtd_erase(mtd, &ei);
 
 	if (retval == 0)
 		return YAFFS_OK;
@@ -176,24 +186,24 @@ static 	int yaffs_mtd_erase(struct yaffs_dev *dev, int block_no)
 static int yaffs_mtd_mark_bad(struct yaffs_dev *dev, int block_no)
 {
 	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-	int blocksize = dev->param.chunks_per_block * dev->data_bytes_per_chunk;
+	int blocksize = dev->param.chunks_per_block * dev->param.total_bytes_per_chunk;
 	int retval;
 
 	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", block_no);
 
-	retval = mtd->block_markbad(mtd, (loff_t) blocksize * block_no);
+	retval = mtd_block_markbad(mtd, (loff_t) blocksize * block_no);
 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
 }
 
 static int yaffs_mtd_check_bad(struct yaffs_dev *dev, int block_no)
 {
 	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-	int blocksize = dev->param.chunks_per_block * dev->data_bytes_per_chunk;
+	int blocksize = dev->param.chunks_per_block * dev->param.total_bytes_per_chunk;
 	int retval;
 
 	yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "checking block %d bad", block_no);
 
-	retval = mtd->block_isbad(mtd, (loff_t) blocksize * block_no);
+	retval = mtd_block_isbad(mtd, (loff_t) blocksize * block_no);
 	return (retval) ? YAFFS_FAIL : YAFFS_OK;
 }
 
@@ -208,7 +218,6 @@ static int yaffs_mtd_deinitialise(struct yaffs_dev *dev)
 }
 
 
-
 void yaffs_mtd_drv_install(struct yaffs_dev *dev)
 {
 	struct yaffs_driver *drv = &dev->drv;
@@ -221,3 +230,65 @@ void yaffs_mtd_drv_install(struct yaffs_dev *dev)
 	drv->drv_initialise_fn = yaffs_mtd_initialise;
 	drv->drv_deinitialise_fn = yaffs_mtd_deinitialise;
 }
+
+
+struct mtd_info * yaffs_get_mtd_device(dev_t sdev)
+{
+	struct mtd_info *mtd;
+
+	mtd = yaffs_get_mtd_device(sdev);
+
+	/* Check it's an mtd device..... */
+	if (MAJOR(sdev) != MTD_BLOCK_MAJOR)
+		return NULL;	/* This isn't an mtd device */
+
+	/* Check it's NAND */
+	if (mtd->type != MTD_NANDFLASH) {
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"yaffs: MTD device is not NAND it's type %d",
+			mtd->type);
+		return NULL;
+	}
+
+	yaffs_trace(YAFFS_TRACE_OS, " %s %d", WRITE_SIZE_STR, WRITE_SIZE(mtd));
+	yaffs_trace(YAFFS_TRACE_OS, " oobsize %d", mtd->oobsize);
+	yaffs_trace(YAFFS_TRACE_OS, " erasesize %d", mtd->erasesize);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+	yaffs_trace(YAFFS_TRACE_OS, " size %u", mtd->size);
+#else
+	yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size);
+#endif
+
+	return mtd;
+}
+
+int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags)
+{
+	if (yaffs_version == 2) {
+		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
+		     mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
+		    !inband_tags) {
+			yaffs_trace(YAFFS_TRACE_ALWAYS,
+				"MTD device does not have the right page sizes"
+			);
+			return -1;
+		}
+	} else {
+		if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
+		    mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
+			yaffs_trace(YAFFS_TRACE_ALWAYS,
+				"MTD device does not support have the right page sizes"
+			);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+
+void yaffs_put_mtd_device(struct mtd_info *mtd)
+{
+	if(mtd)
+		put_mtd_device(mtd);
+}
diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c
index 3cf6dde..92d2f5f 100644
--- a/yaffs_vfs_multi.c
+++ b/yaffs_vfs_multi.c
@@ -62,6 +62,11 @@
 #define YAFFS_NEW_FOLLOW_LINK 0
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))
+#define YAFFS_HAS_WRITE_SUPER
+#endif
+
+
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
 #include <linux/config.h>
 #endif
@@ -134,20 +139,15 @@
 #define Y_INIT_TIMER(a)	init_timer_on_stack(a)
 #endif
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-#define WRITE_SIZE_STR "writesize"
-#define WRITE_SIZE(mtd) ((mtd)->writesize)
-#else
-#define WRITE_SIZE_STR "oobblock"
-#define WRITE_SIZE(mtd) ((mtd)->oobblock)
-#endif
-
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27))
 #define YAFFS_USE_WRITE_BEGIN_END 1
 #else
 #define YAFFS_USE_WRITE_BEGIN_END 0
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))
+#define YAFFS_SUPER_HAS_DIRTY
+#endif
 
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0))
@@ -200,14 +200,12 @@ MODULE_PARM(yaffs_gc_control, "i");
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
 /* use iget and read_inode */
 #define Y_IGET(sb, inum) iget((sb), (inum))
-static void yaffs_read_inode(struct inode *inode);
 
 #else
 /* Call local equivalent */
 #define YAFFS_USE_OWN_IGET
 #define Y_IGET(sb, inum) yaffs_iget((sb), (inum))
 
-static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
 #endif
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
@@ -226,723 +224,488 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
 #define yaffs_super_to_dev(sb)	((struct yaffs_dev *)sb->u.generic_sbp)
 #endif
 
-#define update_dir_time(dir) do {\
-			(dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \
-		} while (0)
-
-static void yaffs_put_super(struct super_block *sb);
-
-static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
-				loff_t *pos);
-static ssize_t yaffs_hold_space(struct file *f);
-static void yaffs_release_space(struct file *f);
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-static int yaffs_file_flush(struct file *file, fl_owner_t id);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
+#define Y_CLEAR_INODE(i) clear_inode(i)
 #else
-static int yaffs_file_flush(struct file *file);
+#define Y_CLEAR_INODE(i) end_writeback(i)
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
-static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync);
-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
-static int yaffs_sync_object(struct file *file, int datasync);
-#else
-static int yaffs_sync_object(struct file *file, struct dentry *dentry,
-			     int datasync);
-#endif
 
-static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir);
+#define update_dir_time(dir) do {\
+			(dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \
+		} while (0)
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
-			struct nameidata *n);
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-				   struct nameidata *n);
-#else
-static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode);
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry);
-#endif
-static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
-		      struct dentry *dentry);
-static int yaffs_unlink(struct inode *dir, struct dentry *dentry);
-static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
-			 const char *symname);
-static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode);
+static void yaffs_fill_inode_from_obj(struct inode *inode,
+				      struct yaffs_obj *obj);
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-		       dev_t dev);
-#else
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-		       int dev);
-#endif
-static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
-			struct inode *new_dir, struct dentry *new_dentry);
-static int yaffs_setattr(struct dentry *dentry, struct iattr *attr);
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-static int yaffs_sync_fs(struct super_block *sb, int wait);
-static void yaffs_write_super(struct super_block *sb);
-#else
-static int yaffs_sync_fs(struct super_block *sb);
-static int yaffs_write_super(struct super_block *sb);
-#endif
+static void yaffs_gross_lock(struct yaffs_dev *dev)
+{
+	yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locking %p", current);
+	mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock));
+	yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locked %p", current);
+}
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf);
-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf);
-#else
-static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
-#endif
+static void yaffs_gross_unlock(struct yaffs_dev *dev)
+{
+	yaffs_trace(YAFFS_TRACE_LOCK, "yaffs unlocking %p", current);
+	mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock));
+}
 
-#ifdef YAFFS_HAS_PUT_INODE
-static void yaffs_put_inode(struct inode *inode);
-#endif
 
-#ifdef YAFFS_HAS_EVICT_INODE
-static void yaffs_evict_inode(struct inode *);
-#else
-static void yaffs_delete_inode(struct inode *);
-static void yaffs_clear_inode(struct inode *);
-#endif
+static int yaffs_readpage_nolock(struct file *f, struct page *pg)
+{
+	/* Lifted from jffs2 */
 
-static int yaffs_readpage(struct file *file, struct page *page);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_writepage(struct page *page, struct writeback_control *wbc);
-#else
-static int yaffs_writepage(struct page *page);
-#endif
+	struct yaffs_obj *obj;
+	unsigned char *pg_buf;
+	int ret;
+	loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT;
+	struct yaffs_dev *dev;
 
-static int yaffs_setxattr(struct dentry *dentry, const char *name,
-		   const void *value, size_t size, int flags);
-static ssize_t yaffs_getxattr(struct dentry *dentry, const char *name,
-				void *buff, size_t size);
-static int yaffs_removexattr(struct dentry *dentry, const char *name);
-static ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size);
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_readpage_nolock at %lld, size %08x",
+		(long long)pos,
+		(unsigned)PAGE_CACHE_SIZE);
 
-#if (YAFFS_USE_WRITE_BEGIN_END != 0)
-static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-			     loff_t pos, unsigned len, unsigned flags,
-			     struct page **pagep, void **fsdata);
-static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-			   loff_t pos, unsigned len, unsigned copied,
-			   struct page *pg, void *fsdadata);
-#else
-static int yaffs_prepare_write(struct file *f, struct page *pg,
-			       unsigned offset, unsigned to);
-static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
-			      unsigned to);
+	obj = yaffs_dentry_to_obj(f->f_dentry);
 
-#endif
+	dev = obj->my_dev;
 
-static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
-			  int buflen);
-#if (YAFFS_NEW_FOLLOW_LINK == 1)
-void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias);
-static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+	BUG_ON(!PageLocked(pg));
 #else
-static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd);
+	if (!PageLocked(pg))
+		PAGE_BUG(pg);
 #endif
 
-static void yaffs_touch_super(struct yaffs_dev *dev);
+	pg_buf = kmap(pg);
+	/* FIXME: Can kmap fail? */
 
-static int yaffs_vfs_setattr(struct inode *, struct iattr *);
+	yaffs_gross_lock(dev);
 
-static struct address_space_operations yaffs_file_address_operations = {
-	.readpage = yaffs_readpage,
-	.writepage = yaffs_writepage,
-#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-	.write_begin = yaffs_write_begin,
-	.write_end = yaffs_write_end,
-#else
-	.prepare_write = yaffs_prepare_write,
-	.commit_write = yaffs_commit_write,
-#endif
-};
+	ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE);
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
-static const struct file_operations yaffs_file_operations = {
-	.read = do_sync_read,
-	.write = do_sync_write,
-	.aio_read = generic_file_aio_read,
-	.aio_write = generic_file_aio_write,
-	.mmap = generic_file_mmap,
-	.flush = yaffs_file_flush,
-	.fsync = yaffs_sync_object,
-	.splice_read = generic_file_splice_read,
-	.splice_write = generic_file_splice_write,
-	.llseek = generic_file_llseek,
-};
+	yaffs_gross_unlock(dev);
 
-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
+	if (ret >= 0)
+		ret = 0;
 
-static const struct file_operations yaffs_file_operations = {
-	.read = do_sync_read,
-	.write = do_sync_write,
-	.aio_read = generic_file_aio_read,
-	.aio_write = generic_file_aio_write,
-	.mmap = generic_file_mmap,
-	.flush = yaffs_file_flush,
-	.fsync = yaffs_sync_object,
-	.sendfile = generic_file_sendfile,
-};
+	if (ret) {
+		ClearPageUptodate(pg);
+		SetPageError(pg);
+	} else {
+		SetPageUptodate(pg);
+		ClearPageError(pg);
+	}
 
-#else
+	flush_dcache_page(pg);
+	kunmap(pg);
 
-static const struct file_operations yaffs_file_operations = {
-	.read = generic_file_read,
-	.write = generic_file_write,
-	.mmap = generic_file_mmap,
-	.flush = yaffs_file_flush,
-	.fsync = yaffs_sync_object,
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-	.sendfile = generic_file_sendfile,
-#endif
-};
-#endif
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done");
+	return ret;
+}
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
-static void zero_user_segment(struct page *page, unsigned start, unsigned end)
+static int yaffs_readpage_unlock(struct file *f, struct page *pg)
 {
-	void *kaddr = kmap_atomic(page, KM_USER0);
-	memset(kaddr + start, 0, end - start);
-	kunmap_atomic(kaddr, KM_USER0);
-	flush_dcache_page(page);
+	int ret = yaffs_readpage_nolock(f, pg);
+	UnlockPage(pg);
+	return ret;
 }
-#endif
 
-static const struct inode_operations yaffs_file_inode_operations = {
-	.setattr = yaffs_setattr,
-	.setxattr = yaffs_setxattr,
-	.getxattr = yaffs_getxattr,
-	.listxattr = yaffs_listxattr,
-	.removexattr = yaffs_removexattr,
-};
+static int yaffs_readpage(struct file *f, struct page *pg)
+{
+	int ret;
 
-static const struct inode_operations yaffs_symlink_inode_operations = {
-	.readlink = yaffs_readlink,
-	.follow_link = yaffs_follow_link,
-#if (YAFFS_NEW_FOLLOW_LINK == 1)
-	.put_link = yaffs_put_link,
-#endif
-	.setattr = yaffs_setattr,
-	.setxattr = yaffs_setxattr,
-	.getxattr = yaffs_getxattr,
-	.listxattr = yaffs_listxattr,
-	.removexattr = yaffs_removexattr,
-};
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage");
+	ret = yaffs_readpage_unlock(f, pg);
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done");
+	return ret;
+}
 
-static const struct inode_operations yaffs_dir_inode_operations = {
-	.create = yaffs_create,
-	.lookup = yaffs_lookup,
-	.link = yaffs_link,
-	.unlink = yaffs_unlink,
-	.symlink = yaffs_symlink,
-	.mkdir = yaffs_mkdir,
-	.rmdir = yaffs_unlink,
-	.mknod = yaffs_mknod,
-	.rename = yaffs_rename,
-	.setattr = yaffs_setattr,
-	.setxattr = yaffs_setxattr,
-	.getxattr = yaffs_getxattr,
-	.listxattr = yaffs_listxattr,
-	.removexattr = yaffs_removexattr,
-};
 
-static const struct file_operations yaffs_dir_operations = {
-	.read = generic_read_dir,
-	.readdir = yaffs_readdir,
-	.fsync = yaffs_sync_object,
-	.llseek = generic_file_llseek,
-};
+static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val)
+{
+	struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev);
 
-static const struct super_operations yaffs_super_ops = {
-	.statfs = yaffs_statfs,
+	if (lc)
+		lc->dirty = val;
 
-#ifndef YAFFS_USE_OWN_IGET
-	.read_inode = yaffs_read_inode,
-#endif
-#ifdef YAFFS_HAS_PUT_INODE
-	.put_inode = yaffs_put_inode,
-#endif
-	.put_super = yaffs_put_super,
-#ifdef YAFFS_HAS_EVICT_INODE
-	.evict_inode = yaffs_evict_inode,
-#else
-	.delete_inode = yaffs_delete_inode,
-	.clear_inode = yaffs_clear_inode,
-#endif
-	.sync_fs = yaffs_sync_fs,
-	.write_super = yaffs_write_super,
-};
+# ifdef YAFFS_SUPER_HAS_DIRTY
+	{
+		struct super_block *sb = lc->super;
 
-static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr)
-{
-#ifdef YAFFS_USE_SETATTR_COPY
-	setattr_copy(inode, attr);
-	return 0;
-#else
-	return inode_setattr(inode, attr);
+		if (sb)
+			sb->s_dirt = val;
+	}
 #endif
 
 }
 
-static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
+static void yaffs_set_super_dirty(struct yaffs_dev *dev)
 {
-#ifdef YAFFS_USE_TRUNCATE_SETSIZE
-	truncate_setsize(inode, newsize);
-	return 0;
-#else
-	truncate_inode_pages(&inode->i_data, newsize);
-	return 0;
-#endif
-
+	yaffs_set_super_dirty_val(dev, 1);
 }
 
-static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev)
+static void yaffs_clear_super_dirty(struct yaffs_dev *dev)
 {
-	return yaffs_gc_control;
+	yaffs_set_super_dirty_val(dev, 0);
 }
 
-static void yaffs_gross_lock(struct yaffs_dev *dev)
+static int yaffs_check_super_dirty(struct yaffs_dev *dev)
 {
-	yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locking %p", current);
-	mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock));
-	yaffs_trace(YAFFS_TRACE_LOCK, "yaffs locked %p", current);
-}
+	struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev);
 
-static void yaffs_gross_unlock(struct yaffs_dev *dev)
-{
-	yaffs_trace(YAFFS_TRACE_LOCK, "yaffs unlocking %p", current);
-	mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock));
-}
+	if (lc && lc->dirty)
+		return 1;
 
-#ifdef YAFFS_COMPILE_EXPORTFS
+# ifdef YAFFS_SUPER_HAS_DIRTY
+	{
+		struct super_block *sb = lc->super;
 
-static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino,
-					  uint32_t generation)
-{
-	return Y_IGET(sb, ino);
-}
+		if (sb && sb->s_dirt)
+			return 1;
+	}
+#endif
+	return 0;
 
-static struct dentry *yaffs2_fh_to_dentry(struct super_block *sb,
-					  struct fid *fid, int fh_len,
-					  int fh_type)
-{
-	return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
-				    yaffs2_nfs_get_inode);
 }
 
-static struct dentry *yaffs2_fh_to_parent(struct super_block *sb,
-					  struct fid *fid, int fh_len,
-					  int fh_type)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
+#else
+static int yaffs_writepage(struct page *page)
+#endif
 {
-	return generic_fh_to_parent(sb, fid, fh_len, fh_type,
-				    yaffs2_nfs_get_inode);
-}
+	struct yaffs_dev *dev;
+	struct address_space *mapping = page->mapping;
+	struct inode *inode;
+	unsigned long end_index;
+	char *buffer;
+	struct yaffs_obj *obj;
+	int n_written = 0;
+	unsigned n_bytes;
+	loff_t i_size;
 
-struct dentry *yaffs2_get_parent(struct dentry *dentry)
-{
+	if (!mapping)
+		BUG();
+	inode = mapping->host;
+	if (!inode)
+		BUG();
+	i_size = i_size_read(inode);
 
-	struct super_block *sb = dentry->d_inode->i_sb;
-	struct dentry *parent = ERR_PTR(-ENOENT);
-	struct inode *inode;
-	unsigned long parent_ino;
-	struct yaffs_obj *d_obj;
-	struct yaffs_obj *parent_obj;
+	end_index = i_size >> PAGE_CACHE_SHIFT;
 
-	d_obj = yaffs_inode_to_obj(dentry->d_inode);
+	if (page->index < end_index)
+		n_bytes = PAGE_CACHE_SIZE;
+	else {
+		n_bytes = i_size & (PAGE_CACHE_SIZE - 1);
 
-	if (d_obj) {
-		parent_obj = d_obj->parent;
-		if (parent_obj) {
-			parent_ino = yaffs_get_obj_inode(parent_obj);
-			inode = Y_IGET(sb, parent_ino);
+		if (page->index > end_index || !n_bytes) {
+			yaffs_trace(YAFFS_TRACE_OS,
+				"yaffs_writepage at %lld, inode size = %lld!!",
+				((loff_t)page->index) << PAGE_CACHE_SHIFT,
+				inode->i_size);
+			yaffs_trace(YAFFS_TRACE_OS,
+				"                -> don't care!!");
 
-			if (IS_ERR(inode)) {
-				parent = ERR_CAST(inode);
-			} else {
-				parent = d_obtain_alias(inode);
-				if (!IS_ERR(parent)) {
-					parent = ERR_PTR(-ENOMEM);
-					iput(inode);
-				}
-			}
+			zero_user_segment(page, 0, PAGE_CACHE_SIZE);
+			set_page_writeback(page);
+			unlock_page(page);
+			end_page_writeback(page);
+			return 0;
 		}
 	}
 
-	return parent;
-}
+	if (n_bytes != PAGE_CACHE_SIZE)
+		zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE);
 
-/* Just declare a zero structure as a NULL value implies
- * using the default functions of exportfs.
- */
+	get_page(page);
 
-static struct export_operations yaffs_export_ops = {
-	.fh_to_dentry = yaffs2_fh_to_dentry,
-	.fh_to_parent = yaffs2_fh_to_parent,
-	.get_parent = yaffs2_get_parent,
-};
+	buffer = kmap(page);
 
-#endif
+	obj = yaffs_inode_to_obj(inode);
+	dev = obj->my_dev;
+	yaffs_gross_lock(dev);
 
-/*-----------------------------------------------------------------*/
-/* Directory search context allows us to unlock access to yaffs during
- * filldir without causing problems with the directory being modified.
- * This is similar to the tried and tested mechanism used in yaffs direct.
- *
- * A search context iterates along a doubly linked list of siblings in the
- * directory. If the iterating object is deleted then this would corrupt
- * the list iteration, likely causing a crash. The search context avoids
- * this by using the remove_obj_fn to move the search context to the
- * next object before the object is deleted.
- *
- * Many readdirs (and thus seach conexts) may be alive simulateously so
- * each struct yaffs_dev has a list of these.
- *
- * A seach context lives for the duration of a readdir.
- *
- * All these functions must be called while yaffs is locked.
- */
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_writepage at %lld, size %08x",
+		((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes);
+	yaffs_trace(YAFFS_TRACE_OS,
+		"writepag0: obj = %lld, ino = %lld",
+		obj->variant.file_variant.file_size, inode->i_size);
 
-struct yaffs_search_context {
-	struct yaffs_dev *dev;
-	struct yaffs_obj *dir_obj;
-	struct yaffs_obj *next_return;
-	struct list_head others;
-};
+	n_written = yaffs_wr_file(obj, buffer,
+				  ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0);
 
-/*
- * yaffs_new_search() creates a new search context, initialises it and
- * adds it to the device's search context list.
- *
- * Called at start of readdir.
- */
-static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir)
-{
-	struct yaffs_dev *dev = dir->my_dev;
-	struct yaffs_search_context *sc =
-	    kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS);
-	if (sc) {
-		sc->dir_obj = dir;
-		sc->dev = dev;
-		if (list_empty(&sc->dir_obj->variant.dir_variant.children))
-			sc->next_return = NULL;
-		else
-			sc->next_return =
-			    list_entry(dir->variant.dir_variant.children.next,
-				       struct yaffs_obj, siblings);
-		INIT_LIST_HEAD(&sc->others);
-		list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts));
-	}
-	return sc;
-}
+	yaffs_set_super_dirty(dev);
 
-/*
- * yaffs_search_end() disposes of a search context and cleans up.
- */
-static void yaffs_search_end(struct yaffs_search_context *sc)
-{
-	if (sc) {
-		list_del(&sc->others);
-		kfree(sc);
-	}
-}
+	yaffs_trace(YAFFS_TRACE_OS,
+		"writepag1: obj = %lld, ino = %lld",
+		obj->variant.file_variant.file_size, inode->i_size);
 
-/*
- * yaffs_search_advance() moves a search context to the next object.
- * Called when the search iterates or when an object removal causes
- * the search context to be moved to the next object.
- */
-static void yaffs_search_advance(struct yaffs_search_context *sc)
-{
-	if (!sc)
-		return;
+	yaffs_gross_unlock(dev);
 
-	if (sc->next_return == NULL ||
-	    list_empty(&sc->dir_obj->variant.dir_variant.children))
-		sc->next_return = NULL;
-	else {
-		struct list_head *next = sc->next_return->siblings.next;
+	kunmap(page);
+	set_page_writeback(page);
+	unlock_page(page);
+	end_page_writeback(page);
+	put_page(page);
 
-		if (next == &sc->dir_obj->variant.dir_variant.children)
-			sc->next_return = NULL;	/* end of list */
-		else
-			sc->next_return =
-			    list_entry(next, struct yaffs_obj, siblings);
-	}
+	return (n_written == n_bytes) ? 0 : -ENOSPC;
 }
 
-/*
- * yaffs_remove_obj_callback() is called when an object is unlinked.
- * We check open search contexts and advance any which are currently
- * on the object being iterated.
- */
-static void yaffs_remove_obj_callback(struct yaffs_obj *obj)
-{
-
-	struct list_head *i;
-	struct yaffs_search_context *sc;
-	struct list_head *search_contexts =
-	    &(yaffs_dev_to_lc(obj->my_dev)->search_contexts);
-
-	/* Iterate through the directory search contexts.
-	 * If any are currently on the object being removed, then advance
-	 * the search context to the next object to prevent a hanging pointer.
-	 */
-	list_for_each(i, search_contexts) {
-		sc = list_entry(i, struct yaffs_search_context, others);
-		if (sc->next_return == obj)
-			yaffs_search_advance(sc);
-	}
+/* Space holding and freeing is done to ensure we have space available for write_begin/end */
+/* For now we just assume few parallel writes and check against a small number. */
+/* Todo: need to do this with a counter to handle parallel reads better */
 
-}
+static ssize_t yaffs_hold_space(struct file *f)
+{
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev;
 
-/*-----------------------------------------------------------------*/
+	int n_free_chunks;
 
-static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
-			  int buflen)
-{
-	unsigned char *alias;
-	int ret;
+	obj = yaffs_dentry_to_obj(f->f_dentry);
 
-	struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
+	dev = obj->my_dev;
 
 	yaffs_gross_lock(dev);
 
-	alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
+	n_free_chunks = yaffs_get_n_free_chunks(dev);
 
 	yaffs_gross_unlock(dev);
 
-	if (!alias)
-		return -ENOMEM;
+	return (n_free_chunks > 20) ? 1 : 0;
+}
 
-	ret = vfs_readlink(dentry, buffer, buflen, alias);
-	kfree(alias);
-	return ret;
-}
-
-#if (YAFFS_NEW_FOLLOW_LINK == 1)
-static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-{
-	void *ret;
-#else
-static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
+static void yaffs_release_space(struct file *f)
 {
-	int ret
-#endif
-	unsigned char *alias;
-	int ret_int = 0;
-	struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev;
+
+	obj = yaffs_dentry_to_obj(f->f_dentry);
+
+	dev = obj->my_dev;
 
 	yaffs_gross_lock(dev);
 
-	alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
 	yaffs_gross_unlock(dev);
-
-	if (!alias) {
-		ret_int = -ENOMEM;
-		goto out;
-	}
-#if (YAFFS_NEW_FOLLOW_LINK == 1)
-	nd_set_link(nd, alias);
-	ret = alias;
-out:
-	if (ret_int)
-		ret = ERR_PTR(ret_int);
-	return ret;
-#else
-	ret = vfs_follow_link(nd, alias);
-	kfree(alias);
-out:
-	if (ret_int)
-		ret = ret_int;
-	return ret;
-#endif
 }
 
-#if (YAFFS_NEW_FOLLOW_LINK == 1)
-void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias)
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
+			     loff_t pos, unsigned len, unsigned flags,
+			     struct page **pagep, void **fsdata)
 {
-	kfree(alias);
-}
-#endif
-
-struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
-			      struct yaffs_obj *obj);
+	struct page *pg = NULL;
+	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
 
-/*
- * Lookup is used to find objects in the fs
- */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+	int ret = 0;
+	int space_held = 0;
 
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
-				   struct nameidata *n)
+	/* Get a page */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+	pg = grab_cache_page_write_begin(mapping, index, flags);
 #else
-static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
+	pg = __grab_cache_page(mapping, index);
 #endif
-{
-	struct yaffs_obj *obj;
-	struct inode *inode = NULL;	/* NCB 2.5/2.6 needs NULL here */
 
-	struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev;
+	*pagep = pg;
+	if (!pg) {
+		ret = -ENOMEM;
+		goto out;
+	}
+	yaffs_trace(YAFFS_TRACE_OS,
+		"start yaffs_write_begin index %d(%x) uptodate %d",
+		(int)index, (int)index, Page_Uptodate(pg) ? 1 : 0);
 
-	if (current != yaffs_dev_to_lc(dev)->readdir_process)
-		yaffs_gross_lock(dev);
+	/* Get fs space */
+	space_held = yaffs_hold_space(filp);
 
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup for %d:%s",
-		yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name);
+	if (!space_held) {
+		ret = -ENOSPC;
+		goto out;
+	}
 
-	obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name);
+	/* Update page if required */
 
-	obj = yaffs_get_equivalent_obj(obj);	/* in case it was a hardlink */
+	if (!Page_Uptodate(pg))
+		ret = yaffs_readpage_nolock(filp, pg);
 
-	/* Can't hold gross lock when calling yaffs_get_inode() */
-	if (current != yaffs_dev_to_lc(dev)->readdir_process)
-		yaffs_gross_unlock(dev);
+	if (ret)
+		goto out;
 
-	if (obj) {
-		yaffs_trace(YAFFS_TRACE_OS,
-			"yaffs_lookup found %d", obj->obj_id);
+	/* Happy path return */
+	yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok");
 
-		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
-	} else {
-		yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found");
+	return 0;
 
+out:
+	yaffs_trace(YAFFS_TRACE_OS,
+		"end yaffs_write_begin fail returning %d", ret);
+	if (space_held)
+		yaffs_release_space(filp);
+	if (pg) {
+		unlock_page(pg);
+		page_cache_release(pg);
 	}
-
-/* added NCB for 2.5/6 compatability - forces add even if inode is
- * NULL which creates dentry hash */
-	d_add(dentry, inode);
-
-	return NULL;
+	return ret;
 }
 
-#ifdef YAFFS_HAS_PUT_INODE
+#else
 
-/* For now put inode is just for debugging
- * Put inode is called when the inode **structure** is put.
- */
-static void yaffs_put_inode(struct inode *inode)
+static int yaffs_prepare_write(struct file *f, struct page *pg,
+			       unsigned offset, unsigned to)
 {
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_put_inode: ino %d, count %d"),
-		(int)inode->i_ino, atomic_read(&inode->i_count);
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write");
 
+	if (!Page_Uptodate(pg))
+		return yaffs_readpage_nolock(f, pg);
+	return 0;
 }
 #endif
 
-static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj)
-{
-	/* Clear the association between the inode and
-	 * the struct yaffs_obj.
-	 */
-	obj->my_inode = NULL;
-	yaffs_inode_to_obj_lv(inode) = NULL;
-
-	/* If the object freeing was deferred, then the real
-	 * free happens now.
-	 * This should fix the inode inconsistency problem.
-	 */
-	yaffs_handle_defered_free(obj);
-}
 
-#ifdef YAFFS_HAS_EVICT_INODE
-/* yaffs_evict_inode combines into one operation what was previously done in
- * yaffs_clear_inode() and yaffs_delete_inode()
- *
- */
-static void yaffs_evict_inode(struct inode *inode)
+static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
+				loff_t * pos)
 {
 	struct yaffs_obj *obj;
+	int n_written;
+	loff_t ipos;
+	struct inode *inode;
 	struct yaffs_dev *dev;
-	int deleteme = 0;
 
-	obj = yaffs_inode_to_obj(inode);
+	obj = yaffs_dentry_to_obj(f->f_dentry);
+
+	if (!obj) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_file_write: hey obj is null!");
+                return -EINVAL;
+        }
+
+	dev = obj->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	inode = f->f_dentry->d_inode;
+
+	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
+		ipos = inode->i_size;
+	else
+		ipos = *pos;
 
 	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_evict_inode: ino %d, count %d %s",
-		(int)inode->i_ino, atomic_read(&inode->i_count),
-		obj ? "object exists" : "null object");
+		"yaffs_file_write about to write writing %u(%x) bytes to object %d at %lld",
+		(unsigned)n, (unsigned)n, obj->obj_id, ipos);
 
-	if (!inode->i_nlink && !is_bad_inode(inode))
-		deleteme = 1;
-	truncate_inode_pages(&inode->i_data, 0);
-	end_writeback(inode);
+	n_written = yaffs_wr_file(obj, buf, ipos, n, 0);
+
+	yaffs_set_super_dirty(dev);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_file_write: %d(%x) bytes written",
+		(unsigned)n, (unsigned)n);
+
+	if (n_written > 0) {
+		ipos += n_written;
+		*pos = ipos;
+		if (ipos > inode->i_size) {
+			inode->i_size = ipos;
+			inode->i_blocks = (ipos + 511) >> 9;
+
+			yaffs_trace(YAFFS_TRACE_OS,
+				"yaffs_file_write size updated to %lld bytes, %d blocks",
+				ipos, (int)(inode->i_blocks));
+		}
 
-	if (deleteme && obj) {
-		dev = obj->my_dev;
-		yaffs_gross_lock(dev);
-		yaffs_del_obj(obj);
-		yaffs_gross_unlock(dev);
-	}
-	if (obj) {
-		dev = obj->my_dev;
-		yaffs_gross_lock(dev);
-		yaffs_unstitch_obj(inode, obj);
-		yaffs_gross_unlock(dev);
 	}
+	yaffs_gross_unlock(dev);
+	return (n_written == 0) && (n > 0) ? -ENOSPC : n_written;
 }
-#else
 
-/* clear is called to tell the fs to release any per-inode data it holds.
- * The object might still exist on disk and is just being thrown out of the cache
- * or else the object has actually been deleted and we're being called via
- * the chain
- *   yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode()
- */
 
-static void yaffs_clear_inode(struct inode *inode)
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+static int yaffs_write_end(struct file *filp, struct address_space *mapping,
+			   loff_t pos, unsigned len, unsigned copied,
+			   struct page *pg, void *fsdadata)
 {
-	struct yaffs_obj *obj;
-	struct yaffs_dev *dev;
+	int ret = 0;
+	void *addr, *kva;
+	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
 
-	obj = yaffs_inode_to_obj(inode);
+	kva = kmap(pg);
+	addr = kva + offset_into_page;
 
 	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_clear_inode: ino %d, count %d %s",
-		(int)inode->i_ino, atomic_read(&inode->i_count),
-		obj ? "object exists" : "null object");
-
-	if (obj) {
-		dev = obj->my_dev;
-		yaffs_gross_lock(dev);
-		yaffs_unstitch_obj(inode, obj);
-		yaffs_gross_unlock(dev);
-	}
+		"yaffs_write_end addr %p pos %lld n_bytes %d",
+		addr, pos, copied);
 
-}
+	ret = yaffs_file_write(filp, addr, copied, &pos);
 
-/* delete is called when the link count is zero and the inode
- * is put (ie. nobody wants to know about it anymore, time to
- * delete the file).
- * NB Must call clear_inode()
- */
-static void yaffs_delete_inode(struct inode *inode)
+	if (ret != copied) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_write_end not same size ret %d  copied %d",
+			ret, copied);
+		SetPageError(pg);
+	}
+
+	kunmap(pg);
+
+	yaffs_release_space(filp);
+	unlock_page(pg);
+	page_cache_release(pg);
+	return ret;
+}
+#else
+
+static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
+			      unsigned to)
 {
-	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
-	struct yaffs_dev *dev;
+	void *addr, *kva;
+
+	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
+	int n_bytes = to - offset;
+	int n_written;
+
+	kva = kmap(pg);
+	addr = kva + offset;
 
 	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_delete_inode: ino %d, count %d %s",
-		(int)inode->i_ino, atomic_read(&inode->i_count),
-		obj ? "object exists" : "null object");
+		"yaffs_commit_write addr %p pos %lld n_bytes %d",
+		addr, pos, n_bytes);
 
-	if (obj) {
-		dev = obj->my_dev;
-		yaffs_gross_lock(dev);
-		yaffs_del_obj(obj);
-		yaffs_gross_unlock(dev);
+	n_written = yaffs_file_write(f, addr, n_bytes, &pos);
+
+	if (n_written != n_bytes) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_commit_write not same size n_written %d  n_bytes %d",
+			n_written, n_bytes);
+		SetPageError(pg);
 	}
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
-	truncate_inode_pages(&inode->i_data, 0);
-#endif
-	clear_inode(inode);
+	kunmap(pg);
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_commit_write returning %d",
+		n_written == n_bytes ? 0 : n_written);
+
+	return n_written == n_bytes ? 0 : n_written;
 }
 #endif
 
+static struct address_space_operations yaffs_file_address_operations = {
+	.readpage = yaffs_readpage,
+	.writepage = yaffs_writepage,
+#if (YAFFS_USE_WRITE_BEGIN_END > 0)
+	.write_begin = yaffs_write_begin,
+	.write_end = yaffs_write_end,
+#else
+	.prepare_write = yaffs_prepare_write,
+	.commit_write = yaffs_commit_write,
+#endif
+};
+
+
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 static int yaffs_file_flush(struct file *file, fl_owner_t id)
 #else
@@ -967,410 +730,435 @@ static int yaffs_file_flush(struct file *file)
 	return 0;
 }
 
-static int yaffs_readpage_nolock(struct file *f, struct page *pg)
-{
-	/* Lifted from jffs2 */
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
+static int yaffs_sync_object(struct file *file, int datasync)
+#else
+static int yaffs_sync_object(struct file *file, struct dentry *dentry,
+			     int datasync)
+#endif
+{
 	struct yaffs_obj *obj;
-	unsigned char *pg_buf;
-	int ret;
-	loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT;
 	struct yaffs_dev *dev;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
+	struct dentry *dentry = file->f_path.dentry;
+#endif
 
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_readpage_nolock at %lld, size %08x",
-		(long long)pos,
-		(unsigned)PAGE_CACHE_SIZE);
-
-	obj = yaffs_dentry_to_obj(f->f_dentry);
+	obj = yaffs_dentry_to_obj(dentry);
 
 	dev = obj->my_dev;
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-	BUG_ON(!PageLocked(pg));
-#else
-	if (!PageLocked(pg))
-		PAGE_BUG(pg);
-#endif
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
+		"yaffs_sync_object");
+	yaffs_gross_lock(dev);
+	yaffs_flush_file(obj, 1, datasync);
+	yaffs_gross_unlock(dev);
+	return 0;
+}
 
-	pg_buf = kmap(pg);
-	/* FIXME: Can kmap fail? */
 
-	yaffs_gross_lock(dev);
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
+static const struct file_operations yaffs_file_operations = {
+	.read = do_sync_read,
+	.write = do_sync_write,
+	.aio_read = generic_file_aio_read,
+	.aio_write = generic_file_aio_write,
+	.mmap = generic_file_mmap,
+	.flush = yaffs_file_flush,
+	.fsync = yaffs_sync_object,
+	.splice_read = generic_file_splice_read,
+	.splice_write = generic_file_splice_write,
+	.llseek = generic_file_llseek,
+};
 
-	ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE);
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
 
-	yaffs_gross_unlock(dev);
+static const struct file_operations yaffs_file_operations = {
+	.read = do_sync_read,
+	.write = do_sync_write,
+	.aio_read = generic_file_aio_read,
+	.aio_write = generic_file_aio_write,
+	.mmap = generic_file_mmap,
+	.flush = yaffs_file_flush,
+	.fsync = yaffs_sync_object,
+	.sendfile = generic_file_sendfile,
+};
 
-	if (ret >= 0)
-		ret = 0;
+#else
 
-	if (ret) {
-		ClearPageUptodate(pg);
-		SetPageError(pg);
-	} else {
-		SetPageUptodate(pg);
-		ClearPageError(pg);
-	}
+static const struct file_operations yaffs_file_operations = {
+	.read = generic_file_read,
+	.write = generic_file_write,
+	.mmap = generic_file_mmap,
+	.flush = yaffs_file_flush,
+	.fsync = yaffs_sync_object,
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+	.sendfile = generic_file_sendfile,
+#endif
+};
+#endif
 
-	flush_dcache_page(pg);
-	kunmap(pg);
 
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done");
-	return ret;
-}
 
-static int yaffs_readpage_unlock(struct file *f, struct page *pg)
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25))
+static void zero_user_segment(struct page *page, unsigned start, unsigned end)
 {
-	int ret = yaffs_readpage_nolock(f, pg);
-	UnlockPage(pg);
-	return ret;
+	void *kaddr = kmap_atomic(page, KM_USER0);
+	memset(kaddr + start, 0, end - start);
+	kunmap_atomic(kaddr, KM_USER0);
+	flush_dcache_page(page);
 }
+#endif
 
-static int yaffs_readpage(struct file *f, struct page *pg)
+
+static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize)
 {
-	int ret;
+#ifdef YAFFS_USE_TRUNCATE_SETSIZE
+	truncate_setsize(inode, newsize);
+	return 0;
+#else
+	truncate_inode_pages(&inode->i_data, newsize);
+	return 0;
+#endif
 
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage");
-	ret = yaffs_readpage_unlock(f, pg);
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done");
-	return ret;
 }
 
-/* writepage inspired by/stolen from smbfs */
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_writepage(struct page *page, struct writeback_control *wbc)
+static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr)
+{
+#ifdef YAFFS_USE_SETATTR_COPY
+	setattr_copy(inode, attr);
+	return 0;
 #else
-static int yaffs_writepage(struct page *page)
+	return inode_setattr(inode, attr);
 #endif
-{
-	struct yaffs_dev *dev;
-	struct address_space *mapping = page->mapping;
-	struct inode *inode;
-	unsigned long end_index;
-	char *buffer;
-	struct yaffs_obj *obj;
-	int n_written = 0;
-	unsigned n_bytes;
-	loff_t i_size;
 
-	if (!mapping)
-		BUG();
-	inode = mapping->host;
-	if (!inode)
-		BUG();
-	i_size = i_size_read(inode);
+}
 
-	end_index = i_size >> PAGE_CACHE_SHIFT;
+static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
+{
+	struct inode *inode = dentry->d_inode;
+	int error = 0;
+	struct yaffs_dev *dev;
 
-	if (page->index < end_index)
-		n_bytes = PAGE_CACHE_SIZE;
-	else {
-		n_bytes = i_size & (PAGE_CACHE_SIZE - 1);
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_setattr of object %d",
+		yaffs_inode_to_obj(inode)->obj_id);
+#if 0
+	/* Fail if a requested resize >= 2GB */
+	if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31))
+		error = -EINVAL;
+#endif
 
-		if (page->index > end_index || !n_bytes) {
+	if (error == 0)
+		error = inode_change_ok(inode, attr);
+	if (error == 0) {
+		int result;
+		if (!error) {
+			error = yaffs_vfs_setattr(inode, attr);
+			yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called");
+			if (attr->ia_valid & ATTR_SIZE) {
+				yaffs_vfs_setsize(inode, attr->ia_size);
+				inode->i_blocks = (inode->i_size + 511) >> 9;
+			}
+		}
+		dev = yaffs_inode_to_obj(inode)->my_dev;
+		if (attr->ia_valid & ATTR_SIZE) {
 			yaffs_trace(YAFFS_TRACE_OS,
-				"yaffs_writepage at %lld, inode size = %lld!!",
-				((loff_t)page->index) << PAGE_CACHE_SHIFT,
-				inode->i_size);
-			yaffs_trace(YAFFS_TRACE_OS,
-				"                -> don't care!!");
-
-			zero_user_segment(page, 0, PAGE_CACHE_SIZE);
-			set_page_writeback(page);
-			unlock_page(page);
-			end_page_writeback(page);
-			return 0;
+				"resize to %d(%x)",
+				(int)(attr->ia_size),
+				(int)(attr->ia_size));
+		}
+		yaffs_gross_lock(dev);
+		result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr);
+		if (result == YAFFS_OK) {
+			error = 0;
+		} else {
+			error = -EPERM;
 		}
+		yaffs_gross_unlock(dev);
+
 	}
 
-	if (n_bytes != PAGE_CACHE_SIZE)
-		zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE);
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error);
 
-	get_page(page);
+	return error;
+}
 
-	buffer = kmap(page);
+static int yaffs_setxattr(struct dentry *dentry, const char *name,
+		   const void *value, size_t size, int flags)
+{
+	struct inode *inode = dentry->d_inode;
+	int error = 0;
+	struct yaffs_dev *dev;
+	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-	obj = yaffs_inode_to_obj(inode);
-	dev = obj->my_dev;
-	yaffs_gross_lock(dev);
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id);
 
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_writepage at %lld, size %08x",
-		((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes);
-	yaffs_trace(YAFFS_TRACE_OS,
-		"writepag0: obj = %lld, ino = %lld",
-		obj->variant.file_variant.file_size, inode->i_size);
+	if (error == 0) {
+		int result;
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		result = yaffs_set_xattrib(obj, name, value, size, flags);
+		if (result == YAFFS_OK)
+			error = 0;
+		else if (result < 0)
+			error = result;
+		yaffs_gross_unlock(dev);
 
-	n_written = yaffs_wr_file(obj, buffer,
-				  ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0);
+	}
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error);
+
+	return error;
+}
 
-	yaffs_touch_super(dev);
+static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name,
+			void *buff, size_t size)
+{
+	struct inode *inode = dentry->d_inode;
+	int error = 0;
+	struct yaffs_dev *dev;
+	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
 	yaffs_trace(YAFFS_TRACE_OS,
-		"writepag1: obj = %lld, ino = %lld",
-		obj->variant.file_variant.file_size, inode->i_size);
+		"yaffs_getxattr \"%s\" from object %d",
+		name, obj->obj_id);
 
-	yaffs_gross_unlock(dev);
+	if (error == 0) {
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		error = yaffs_get_xattrib(obj, name, buff, size);
+		yaffs_gross_unlock(dev);
 
-	kunmap(page);
-	set_page_writeback(page);
-	unlock_page(page);
-	end_page_writeback(page);
-	put_page(page);
+	}
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error);
 
-	return (n_written == n_bytes) ? 0 : -ENOSPC;
+	return error;
 }
 
-#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
-			     loff_t pos, unsigned len, unsigned flags,
-			     struct page **pagep, void **fsdata)
+static int yaffs_removexattr(struct dentry *dentry, const char *name)
 {
-	struct page *pg = NULL;
-	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
-
-	int ret = 0;
-	int space_held = 0;
-
-	/* Get a page */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-	pg = grab_cache_page_write_begin(mapping, index, flags);
-#else
-	pg = __grab_cache_page(mapping, index);
-#endif
+	struct inode *inode = dentry->d_inode;
+	int error = 0;
+	struct yaffs_dev *dev;
+	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-	*pagep = pg;
-	if (!pg) {
-		ret = -ENOMEM;
-		goto out;
-	}
 	yaffs_trace(YAFFS_TRACE_OS,
-		"start yaffs_write_begin index %d(%x) uptodate %d",
-		(int)index, (int)index, Page_Uptodate(pg) ? 1 : 0);
+		"yaffs_removexattr of object %d", obj->obj_id);
 
-	/* Get fs space */
-	space_held = yaffs_hold_space(filp);
+	if (error == 0) {
+		int result;
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		result = yaffs_remove_xattrib(obj, name);
+		if (result == YAFFS_OK)
+			error = 0;
+		else if (result < 0)
+			error = result;
+		yaffs_gross_unlock(dev);
 
-	if (!space_held) {
-		ret = -ENOSPC;
-		goto out;
 	}
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_removexattr done returning %d", error);
 
-	/* Update page if required */
-
-	if (!Page_Uptodate(pg))
-		ret = yaffs_readpage_nolock(filp, pg);
+	return error;
+}
 
-	if (ret)
-		goto out;
+static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size)
+{
+	struct inode *inode = dentry->d_inode;
+	int error = 0;
+	struct yaffs_dev *dev;
+	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-	/* Happy path return */
-	yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok");
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_listxattr of object %d", obj->obj_id);
 
-	return 0;
+	if (error == 0) {
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		error = yaffs_list_xattrib(obj, buff, size);
+		yaffs_gross_unlock(dev);
 
-out:
-	yaffs_trace(YAFFS_TRACE_OS,
-		"end yaffs_write_begin fail returning %d", ret);
-	if (space_held)
-		yaffs_release_space(filp);
-	if (pg) {
-		unlock_page(pg);
-		page_cache_release(pg);
 	}
-	return ret;
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_listxattr done returning %d", error);
+
+	return error;
 }
 
-#else
 
-static int yaffs_prepare_write(struct file *f, struct page *pg,
-			       unsigned offset, unsigned to)
-{
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write");
+static const struct inode_operations yaffs_file_inode_operations = {
+	.setattr = yaffs_setattr,
+	.setxattr = yaffs_setxattr,
+	.getxattr = yaffs_getxattr,
+	.listxattr = yaffs_listxattr,
+	.removexattr = yaffs_removexattr,
+};
 
-	if (!Page_Uptodate(pg))
-		return yaffs_readpage_nolock(f, pg);
-	return 0;
-}
-#endif
 
-#if (YAFFS_USE_WRITE_BEGIN_END > 0)
-static int yaffs_write_end(struct file *filp, struct address_space *mapping,
-			   loff_t pos, unsigned len, unsigned copied,
-			   struct page *pg, void *fsdadata)
+static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
+			  int buflen)
 {
-	int ret = 0;
-	void *addr, *kva;
-	uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1);
+	unsigned char *alias;
+	int ret;
 
-	kva = kmap(pg);
-	addr = kva + offset_into_page;
+	struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
 
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_write_end addr %p pos %lld n_bytes %d",
-		addr, pos, copied);
+	yaffs_gross_lock(dev);
 
-	ret = yaffs_file_write(filp, addr, copied, &pos);
+	alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
 
-	if (ret != copied) {
-		yaffs_trace(YAFFS_TRACE_OS,
-			"yaffs_write_end not same size ret %d  copied %d",
-			ret, copied);
-		SetPageError(pg);
-	}
+	yaffs_gross_unlock(dev);
 
-	kunmap(pg);
+	if (!alias)
+		return -ENOMEM;
 
-	yaffs_release_space(filp);
-	unlock_page(pg);
-	page_cache_release(pg);
+	ret = vfs_readlink(dentry, buffer, buflen, alias);
+	kfree(alias);
 	return ret;
 }
-#else
 
-static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
-			      unsigned to)
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-	void *addr, *kva;
-
-	loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset;
-	int n_bytes = to - offset;
-	int n_written;
-
-	kva = kmap(pg);
-	addr = kva + offset;
+	void *ret;
+#else
+static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
+{
+	int ret
+#endif
+	unsigned char *alias;
+	int ret_int = 0;
+	struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev;
 
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_commit_write addr %p pos %lld n_bytes %d",
-		addr, pos, n_bytes);
+	yaffs_gross_lock(dev);
 
-	n_written = yaffs_file_write(f, addr, n_bytes, &pos);
+	alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry));
+	yaffs_gross_unlock(dev);
 
-	if (n_written != n_bytes) {
-		yaffs_trace(YAFFS_TRACE_OS,
-			"yaffs_commit_write not same size n_written %d  n_bytes %d",
-			n_written, n_bytes);
-		SetPageError(pg);
+	if (!alias) {
+		ret_int = -ENOMEM;
+		goto out;
 	}
-	kunmap(pg);
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+	nd_set_link(nd, alias);
+	ret = alias;
+out:
+	if (ret_int)
+		ret = ERR_PTR(ret_int);
+	return ret;
+#else
+	ret = vfs_follow_link(nd, alias);
+	kfree(alias);
+out:
+	if (ret_int)
+		ret = ret_int;
+	return ret;
+#endif
+}
+
+
+#ifdef YAFFS_HAS_PUT_INODE
 
+/* For now put inode is just for debugging
+ * Put inode is called when the inode **structure** is put.
+ */
+static void yaffs_put_inode(struct inode *inode)
+{
 	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_commit_write returning %d",
-		n_written == n_bytes ? 0 : n_written);
+		"yaffs_put_inode: ino %d, count %d"),
+		(int)inode->i_ino, atomic_read(&inode->i_count);
 
-	return n_written == n_bytes ? 0 : n_written;
 }
 #endif
 
-static void yaffs_fill_inode_from_obj(struct inode *inode,
-				      struct yaffs_obj *obj)
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias)
 {
-	if (inode && obj) {
+	kfree(alias);
+}
+#endif
 
-		/* Check mode against the variant type and attempt to repair if broken. */
-		u32 mode = obj->yst_mode;
-		switch (obj->variant_type) {
-		case YAFFS_OBJECT_TYPE_FILE:
-			if (!S_ISREG(mode)) {
-				obj->yst_mode &= ~S_IFMT;
-				obj->yst_mode |= S_IFREG;
-			}
+static const struct inode_operations yaffs_symlink_inode_operations = {
+	.readlink = yaffs_readlink,
+	.follow_link = yaffs_follow_link,
+#if (YAFFS_NEW_FOLLOW_LINK == 1)
+	.put_link = yaffs_put_link,
+#endif
+	.setattr = yaffs_setattr,
+	.setxattr = yaffs_setxattr,
+	.getxattr = yaffs_getxattr,
+	.listxattr = yaffs_listxattr,
+	.removexattr = yaffs_removexattr,
+};
 
-			break;
-		case YAFFS_OBJECT_TYPE_SYMLINK:
-			if (!S_ISLNK(mode)) {
-				obj->yst_mode &= ~S_IFMT;
-				obj->yst_mode |= S_IFLNK;
-			}
+#ifdef YAFFS_USE_OWN_IGET
 
-			break;
-		case YAFFS_OBJECT_TYPE_DIRECTORY:
-			if (!S_ISDIR(mode)) {
-				obj->yst_mode &= ~S_IFMT;
-				obj->yst_mode |= S_IFDIR;
-			}
+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
+{
+	struct inode *inode;
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
 
-			break;
-		case YAFFS_OBJECT_TYPE_UNKNOWN:
-		case YAFFS_OBJECT_TYPE_HARDLINK:
-		case YAFFS_OBJECT_TYPE_SPECIAL:
-		default:
-			/* TODO? */
-			break;
-		}
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino);
 
-		inode->i_flags |= S_NOATIME;
+	inode = iget_locked(sb, ino);
+	if (!inode)
+		return ERR_PTR(-ENOMEM);
+	if (!(inode->i_state & I_NEW))
+		return inode;
 
-		inode->i_ino = obj->obj_id;
-		inode->i_mode = obj->yst_mode;
-		inode->i_uid = obj->yst_uid;
-		inode->i_gid = obj->yst_gid;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
-		inode->i_blksize = inode->i_sb->s_blocksize;
-#endif
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+	/* NB This is called as a side effect of other functions, but
+	 * we had to release the lock to prevent deadlocks, so
+	 * need to lock again.
+	 */
 
-		inode->i_rdev = old_decode_dev(obj->yst_rdev);
-		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
-		inode->i_atime.tv_nsec = 0;
-		inode->i_mtime.tv_sec = (time_t) obj->yst_mtime;
-		inode->i_mtime.tv_nsec = 0;
-		inode->i_ctime.tv_sec = (time_t) obj->yst_ctime;
-		inode->i_ctime.tv_nsec = 0;
-#else
-		inode->i_rdev = obj->yst_rdev;
-		inode->i_atime = obj->yst_atime;
-		inode->i_mtime = obj->yst_mtime;
-		inode->i_ctime = obj->yst_ctime;
-#endif
-		inode->i_size = yaffs_get_obj_length(obj);
-		inode->i_blocks = (inode->i_size + 511) >> 9;
+	yaffs_gross_lock(dev);
 
-		set_nlink(inode, yaffs_get_obj_link_count(obj));
+	obj = yaffs_find_by_number(dev, inode->i_ino);
 
-		yaffs_trace(YAFFS_TRACE_OS,
-			"yaffs_fill_inode mode %x uid %d gid %d size %lld count %d",
-			inode->i_mode, inode->i_uid, inode->i_gid,
-			inode->i_size, atomic_read(&inode->i_count));
+	yaffs_fill_inode_from_obj(inode, obj);
+
+	yaffs_gross_unlock(dev);
+
+	unlock_new_inode(inode);
+	return inode;
+}
 
-		switch (obj->yst_mode & S_IFMT) {
-		default:	/* fifo, device or socket */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-			init_special_inode(inode, obj->yst_mode,
-					   old_decode_dev(obj->yst_rdev));
 #else
-			init_special_inode(inode, obj->yst_mode,
-					   (dev_t) (obj->yst_rdev));
-#endif
-			break;
-		case S_IFREG:	/* file */
-			inode->i_op = &yaffs_file_inode_operations;
-			inode->i_fop = &yaffs_file_operations;
-			inode->i_mapping->a_ops =
-			    &yaffs_file_address_operations;
-			break;
-		case S_IFDIR:	/* directory */
-			inode->i_op = &yaffs_dir_inode_operations;
-			inode->i_fop = &yaffs_dir_operations;
-			break;
-		case S_IFLNK:	/* symlink */
-			inode->i_op = &yaffs_symlink_inode_operations;
-			break;
-		}
 
-		yaffs_inode_to_obj_lv(inode) = obj;
+static void yaffs_read_inode(struct inode *inode)
+{
+	/* NB This is called as a side effect of other functions, but
+	 * we had to release the lock to prevent deadlocks, so
+	 * need to lock again.
+	 */
 
-		obj->my_inode = inode;
+	struct yaffs_obj *obj;
+	struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb);
 
-	} else {
-		yaffs_trace(YAFFS_TRACE_OS,
-			"yaffs_fill_inode invalid parameters");
-	}
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_read_inode for %d", (int)inode->i_ino);
+
+	if (current != yaffs_dev_to_lc(dev)->readdir_process)
+		yaffs_gross_lock(dev);
+
+	obj = yaffs_find_by_number(dev, inode->i_ino);
 
+	yaffs_fill_inode_from_obj(inode, obj);
+
+	if (current != yaffs_dev_to_lc(dev)->readdir_process)
+		yaffs_gross_unlock(dev);
 }
 
+#endif
+
+
+
 struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
 			      struct yaffs_obj *obj)
 {
@@ -1404,258 +1192,57 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
 	return inode;
 }
 
-static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
-				loff_t * pos)
+
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
+#define YCRED(x) x
+#else
+#define YCRED(x) (x->cred)
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode,
+		       dev_t rdev)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
+		       dev_t rdev)
+#else
+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
+		       int rdev)
+#endif
 {
-	struct yaffs_obj *obj;
-	int n_written;
-	loff_t ipos;
 	struct inode *inode;
-	struct yaffs_dev *dev;
-
-	obj = yaffs_dentry_to_obj(f->f_dentry);
 
-	if (!obj) {
-		yaffs_trace(YAFFS_TRACE_OS,
-			"yaffs_file_write: hey obj is null!");
-                return -EINVAL;
-        }
+	struct yaffs_obj *obj = NULL;
+	struct yaffs_dev *dev;
 
-	dev = obj->my_dev;
+	struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
 
-	yaffs_gross_lock(dev);
+	int error = -ENOSPC;
+	uid_t uid = YCRED(current)->fsuid;
+	gid_t gid =
+	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
 
-	inode = f->f_dentry->d_inode;
+	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
+		mode |= S_ISGID;
 
-	if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND)
-		ipos = inode->i_size;
-	else
-		ipos = *pos;
+	if (parent) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_mknod: parent object %d type %d",
+			parent->obj_id, parent->variant_type);
+	} else {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_mknod: could not get parent object");
+		return -EPERM;
+	}
 
 	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_file_write about to write writing %u(%x) bytes to object %d at %lld",
-		(unsigned)n, (unsigned)n, obj->obj_id, ipos);
-
-	n_written = yaffs_wr_file(obj, buf, ipos, n, 0);
+		"yaffs_mknod: making oject for %s, mode %x dev %x",
+		dentry->d_name.name, mode, rdev);
 
-	yaffs_touch_super(dev);
+	dev = parent->my_dev;
 
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_file_write: %d(%x) bytes written",
-		(unsigned)n, (unsigned)n);
-
-	if (n_written > 0) {
-		ipos += n_written;
-		*pos = ipos;
-		if (ipos > inode->i_size) {
-			inode->i_size = ipos;
-			inode->i_blocks = (ipos + 511) >> 9;
-
-			yaffs_trace(YAFFS_TRACE_OS,
-				"yaffs_file_write size updated to %lld bytes, %d blocks",
-				ipos, (int)(inode->i_blocks));
-		}
-
-	}
-	yaffs_gross_unlock(dev);
-	return (n_written == 0) && (n > 0) ? -ENOSPC : n_written;
-}
-
-/* Space holding and freeing is done to ensure we have space available for write_begin/end */
-/* For now we just assume few parallel writes and check against a small number. */
-/* Todo: need to do this with a counter to handle parallel reads better */
-
-static ssize_t yaffs_hold_space(struct file *f)
-{
-	struct yaffs_obj *obj;
-	struct yaffs_dev *dev;
-
-	int n_free_chunks;
-
-	obj = yaffs_dentry_to_obj(f->f_dentry);
-
-	dev = obj->my_dev;
-
-	yaffs_gross_lock(dev);
-
-	n_free_chunks = yaffs_get_n_free_chunks(dev);
-
-	yaffs_gross_unlock(dev);
-
-	return (n_free_chunks > 20) ? 1 : 0;
-}
-
-static void yaffs_release_space(struct file *f)
-{
-	struct yaffs_obj *obj;
-	struct yaffs_dev *dev;
-
-	obj = yaffs_dentry_to_obj(f->f_dentry);
-
-	dev = obj->my_dev;
-
-	yaffs_gross_lock(dev);
-
-	yaffs_gross_unlock(dev);
-}
-
-static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
-{
-	struct yaffs_obj *obj;
-	struct yaffs_dev *dev;
-	struct yaffs_search_context *sc;
-	struct inode *inode = f->f_dentry->d_inode;
-	unsigned long offset, curoffs;
-	struct yaffs_obj *l;
-	int ret_val = 0;
-
-	char name[YAFFS_MAX_NAME_LENGTH + 1];
-
-	obj = yaffs_dentry_to_obj(f->f_dentry);
-	dev = obj->my_dev;
-
-	yaffs_gross_lock(dev);
-
-	yaffs_dev_to_lc(dev)->readdir_process = current;
-
-	offset = f->f_pos;
-
-	sc = yaffs_new_search(obj);
-	if (!sc) {
-		ret_val = -ENOMEM;
-		goto out;
-	}
-
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_readdir: starting at %d", (int)offset);
-
-	if (offset == 0) {
-		yaffs_trace(YAFFS_TRACE_OS,
-			"yaffs_readdir: entry . ino %d",
-			(int)inode->i_ino);
-		yaffs_gross_unlock(dev);
-		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0) {
-			yaffs_gross_lock(dev);
-			goto out;
-		}
-		yaffs_gross_lock(dev);
-		offset++;
-		f->f_pos++;
-	}
-	if (offset == 1) {
-		yaffs_trace(YAFFS_TRACE_OS,
-			"yaffs_readdir: entry .. ino %d",
-			(int)f->f_dentry->d_parent->d_inode->i_ino);
-		yaffs_gross_unlock(dev);
-		if (filldir(dirent, "..", 2, offset,
-			    f->f_dentry->d_parent->d_inode->i_ino,
-			    DT_DIR) < 0) {
-			yaffs_gross_lock(dev);
-			goto out;
-		}
-		yaffs_gross_lock(dev);
-		offset++;
-		f->f_pos++;
-	}
-
-	curoffs = 1;
-
-	/* If the directory has changed since the open or last call to
-	   readdir, rewind to after the 2 canned entries. */
-	if (f->f_version != inode->i_version) {
-		offset = 2;
-		f->f_pos = offset;
-		f->f_version = inode->i_version;
-	}
-
-	while (sc->next_return) {
-		curoffs++;
-		l = sc->next_return;
-		if (curoffs >= offset) {
-			int this_inode = yaffs_get_obj_inode(l);
-			int this_type = yaffs_get_obj_type(l);
-
-			yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
-			yaffs_trace(YAFFS_TRACE_OS,
-				"yaffs_readdir: %s inode %d",
-				name, yaffs_get_obj_inode(l));
-
-			yaffs_gross_unlock(dev);
-
-			if (filldir(dirent,
-				    name,
-				    strlen(name),
-				    offset, this_inode, this_type) < 0) {
-				yaffs_gross_lock(dev);
-				goto out;
-			}
-
-			yaffs_gross_lock(dev);
-
-			offset++;
-			f->f_pos++;
-		}
-		yaffs_search_advance(sc);
-	}
-
-out:
-	yaffs_search_end(sc);
-	yaffs_dev_to_lc(dev)->readdir_process = NULL;
-	yaffs_gross_unlock(dev);
-
-	return ret_val;
-}
-
-/*
- * File creation. Allocate an inode, and we're done..
- */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-#define YCRED(x) x
-#else
-#define YCRED(x) (x->cred)
-#endif
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-		       dev_t rdev)
-#else
-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
-		       int rdev)
-#endif
-{
-	struct inode *inode;
-
-	struct yaffs_obj *obj = NULL;
-	struct yaffs_dev *dev;
-
-	struct yaffs_obj *parent = yaffs_inode_to_obj(dir);
-
-	int error = -ENOSPC;
-	uid_t uid = YCRED(current)->fsuid;
-	gid_t gid =
-	    (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
-
-	if ((dir->i_mode & S_ISGID) && S_ISDIR(mode))
-		mode |= S_ISGID;
-
-	if (parent) {
-		yaffs_trace(YAFFS_TRACE_OS,
-			"yaffs_mknod: parent object %d type %d",
-			parent->obj_id, parent->variant_type);
-	} else {
-		yaffs_trace(YAFFS_TRACE_OS,
-			"yaffs_mknod: could not get parent object");
-		return -EPERM;
-	}
-
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_mknod: making oject for %s, mode %x dev %x",
-		dentry->d_name.name, mode, rdev);
-
-	dev = parent->my_dev;
-
-	yaffs_gross_lock(dev);
+	yaffs_gross_lock(dev);
 
 	switch (mode & S_IFMT) {
 	default:
@@ -1707,7 +1294,11 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
 	return error;
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+#else
 static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+#endif
 {
 	int ret_val;
 	yaffs_trace(YAFFS_TRACE_OS, "yaffs_mkdir");
@@ -1715,7 +1306,14 @@ static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 	return ret_val;
 }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+			bool dummy)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+			struct nameidata *n)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
 static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
 			struct nameidata *n)
 #else
@@ -1726,36 +1324,55 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
 	return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
 }
 
-static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
+				   unsigned int dummy)
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry,
+				   struct nameidata *n)
+#else
+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
+#endif
 {
-	int ret_val;
-
-	struct yaffs_dev *dev;
 	struct yaffs_obj *obj;
+	struct inode *inode = NULL;	/* NCB 2.5/2.6 needs NULL here */
 
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_unlink %d:%s",
-		(int)(dir->i_ino), dentry->d_name.name);
-	obj = yaffs_inode_to_obj(dir);
-	dev = obj->my_dev;
+	struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev;
 
-	yaffs_gross_lock(dev);
+	if (current != yaffs_dev_to_lc(dev)->readdir_process)
+		yaffs_gross_lock(dev);
 
-	ret_val = yaffs_unlinker(obj, dentry->d_name.name);
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup for %d:%s",
+		yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name);
 
-	if (ret_val == YAFFS_OK) {
-		inode_dec_link_count(dentry->d_inode);
-		dir->i_version++;
+	obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name);
+
+	obj = yaffs_get_equivalent_obj(obj);	/* in case it was a hardlink */
+
+	/* Can't hold gross lock when calling yaffs_get_inode() */
+	if (current != yaffs_dev_to_lc(dev)->readdir_process)
 		yaffs_gross_unlock(dev);
-		update_dir_time(dir);
-		return 0;
-	}
-	yaffs_gross_unlock(dev);
-	return -ENOTEMPTY;
-}
 
-/*
- * Create a link...
- */
+	if (obj) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_lookup found %d", obj->obj_id);
+
+		inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
+	} else {
+		yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found");
+
+	}
+
+/* added NCB for 2.5/6 compatability - forces add even if inode is
+ * NULL which creates dentry hash */
+	d_add(dentry, inode);
+
+	return NULL;
+}
+
+/*
+ * Create a link...
+ */
 static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
 		      struct dentry *dentry)
 {
@@ -1836,236 +1453,873 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
 	return -ENOMEM;
 }
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
-static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync)
-#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
-static int yaffs_sync_object(struct file *file, int datasync)
-#else
-static int yaffs_sync_object(struct file *file, struct dentry *dentry,
-			     int datasync)
-#endif
+/*
+ * The VFS layer already does all the dentry stuff for rename.
+ *
+ * NB: POSIX says you can rename an object over an old object of the same name
+ */
+static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
+			struct inode *new_dir, struct dentry *new_dentry)
+{
+	struct yaffs_dev *dev;
+	int ret_val = YAFFS_FAIL;
+	struct yaffs_obj *target;
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_rename");
+	dev = yaffs_inode_to_obj(old_dir)->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	/* Check if the target is an existing directory that is not empty. */
+	target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir),
+				    new_dentry->d_name.name);
+
+	if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
+	    !list_empty(&target->variant.dir_variant.children)) {
+
+		yaffs_trace(YAFFS_TRACE_OS, "target is non-empty dir");
+
+		ret_val = YAFFS_FAIL;
+	} else {
+		/* Now does unlinking internally using shadowing mechanism */
+		yaffs_trace(YAFFS_TRACE_OS, "calling yaffs_rename_obj");
+
+		ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir),
+					   old_dentry->d_name.name,
+					   yaffs_inode_to_obj(new_dir),
+					   new_dentry->d_name.name);
+	}
+	yaffs_gross_unlock(dev);
+
+	if (ret_val == YAFFS_OK) {
+		if (target)
+			inode_dec_link_count(new_dentry->d_inode);
+
+		update_dir_time(old_dir);
+		if (old_dir != new_dir)
+			update_dir_time(new_dir);
+		return 0;
+	} else {
+		return -ENOTEMPTY;
+	}
+}
+
+
+
+
+static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
+{
+	int ret_val;
+
+	struct yaffs_dev *dev;
+	struct yaffs_obj *obj;
+
+	yaffs_trace(YAFFS_TRACE_OS, "yaffs_unlink %d:%s",
+		(int)(dir->i_ino), dentry->d_name.name);
+	obj = yaffs_inode_to_obj(dir);
+	dev = obj->my_dev;
+
+	yaffs_gross_lock(dev);
+
+	ret_val = yaffs_unlinker(obj, dentry->d_name.name);
+
+	if (ret_val == YAFFS_OK) {
+		inode_dec_link_count(dentry->d_inode);
+		dir->i_version++;
+		yaffs_gross_unlock(dev);
+		update_dir_time(dir);
+		return 0;
+	}
+	yaffs_gross_unlock(dev);
+	return -ENOTEMPTY;
+}
+
+
+
+static const struct inode_operations yaffs_dir_inode_operations = {
+	.create = yaffs_create,
+	.lookup = yaffs_lookup,
+	.link = yaffs_link,
+	.unlink = yaffs_unlink,
+	.symlink = yaffs_symlink,
+	.mkdir = yaffs_mkdir,
+	.rmdir = yaffs_unlink,
+	.mknod = yaffs_mknod,
+	.rename = yaffs_rename,
+	.setattr = yaffs_setattr,
+	.setxattr = yaffs_setxattr,
+	.getxattr = yaffs_getxattr,
+	.listxattr = yaffs_listxattr,
+	.removexattr = yaffs_removexattr,
+};
+
+/*-----------------------------------------------------------------*/
+/* Directory search context allows us to unlock access to yaffs during
+ * filldir without causing problems with the directory being modified.
+ * This is similar to the tried and tested mechanism used in yaffs direct.
+ *
+ * A search context iterates along a doubly linked list of siblings in the
+ * directory. If the iterating object is deleted then this would corrupt
+ * the list iteration, likely causing a crash. The search context avoids
+ * this by using the remove_obj_fn to move the search context to the
+ * next object before the object is deleted.
+ *
+ * Many readdirs (and thus seach conexts) may be alive simulateously so
+ * each struct yaffs_dev has a list of these.
+ *
+ * A seach context lives for the duration of a readdir.
+ *
+ * All these functions must be called while yaffs is locked.
+ */
+
+struct yaffs_search_context {
+	struct yaffs_dev *dev;
+	struct yaffs_obj *dir_obj;
+	struct yaffs_obj *next_return;
+	struct list_head others;
+};
+
+/*
+ * yaffs_new_search() creates a new search context, initialises it and
+ * adds it to the device's search context list.
+ *
+ * Called at start of readdir.
+ */
+static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir)
+{
+	struct yaffs_dev *dev = dir->my_dev;
+	struct yaffs_search_context *sc =
+	    kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS);
+	if (sc) {
+		sc->dir_obj = dir;
+		sc->dev = dev;
+		if (list_empty(&sc->dir_obj->variant.dir_variant.children))
+			sc->next_return = NULL;
+		else
+			sc->next_return =
+			    list_entry(dir->variant.dir_variant.children.next,
+				       struct yaffs_obj, siblings);
+		INIT_LIST_HEAD(&sc->others);
+		list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts));
+	}
+	return sc;
+}
+
+/*
+ * yaffs_search_end() disposes of a search context and cleans up.
+ */
+static void yaffs_search_end(struct yaffs_search_context *sc)
+{
+	if (sc) {
+		list_del(&sc->others);
+		kfree(sc);
+	}
+}
+
+/*
+ * yaffs_search_advance() moves a search context to the next object.
+ * Called when the search iterates or when an object removal causes
+ * the search context to be moved to the next object.
+ */
+static void yaffs_search_advance(struct yaffs_search_context *sc)
+{
+	if (!sc)
+		return;
+
+	if (sc->next_return == NULL ||
+	    list_empty(&sc->dir_obj->variant.dir_variant.children))
+		sc->next_return = NULL;
+	else {
+		struct list_head *next = sc->next_return->siblings.next;
+
+		if (next == &sc->dir_obj->variant.dir_variant.children)
+			sc->next_return = NULL;	/* end of list */
+		else
+			sc->next_return =
+			    list_entry(next, struct yaffs_obj, siblings);
+	}
+}
+
+/*
+ * yaffs_remove_obj_callback() is called when an object is unlinked.
+ * We check open search contexts and advance any which are currently
+ * on the object being iterated.
+ */
+static void yaffs_remove_obj_callback(struct yaffs_obj *obj)
 {
 
+	struct list_head *i;
+	struct yaffs_search_context *sc;
+	struct list_head *search_contexts =
+	    &(yaffs_dev_to_lc(obj->my_dev)->search_contexts);
+
+	/* Iterate through the directory search contexts.
+	 * If any are currently on the object being removed, then advance
+	 * the search context to the next object to prevent a hanging pointer.
+	 */
+	list_for_each(i, search_contexts) {
+		sc = list_entry(i, struct yaffs_search_context, others);
+		if (sc->next_return == obj)
+			yaffs_search_advance(sc);
+	}
+
+}
+
+
+/*-----------------------------------------------------------------*/
+
+static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
+{
 	struct yaffs_obj *obj;
 	struct yaffs_dev *dev;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34))
-	struct dentry *dentry = file->f_path.dentry;
-#endif
+	struct yaffs_search_context *sc;
+	struct inode *inode = f->f_dentry->d_inode;
+	unsigned long offset, curoffs;
+	struct yaffs_obj *l;
+	int ret_val = 0;
 
-	obj = yaffs_dentry_to_obj(dentry);
+	char name[YAFFS_MAX_NAME_LENGTH + 1];
 
+	obj = yaffs_dentry_to_obj(f->f_dentry);
 	dev = obj->my_dev;
 
-	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
-		"yaffs_sync_object");
 	yaffs_gross_lock(dev);
-	yaffs_flush_file(obj, 1, datasync);
+
+	yaffs_dev_to_lc(dev)->readdir_process = current;
+
+	offset = f->f_pos;
+
+	sc = yaffs_new_search(obj);
+	if (!sc) {
+		ret_val = -ENOMEM;
+		goto out;
+	}
+
+	yaffs_trace(YAFFS_TRACE_OS,
+		"yaffs_readdir: starting at %d", (int)offset);
+
+	if (offset == 0) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_readdir: entry . ino %d",
+			(int)inode->i_ino);
+		yaffs_gross_unlock(dev);
+		if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0) {
+			yaffs_gross_lock(dev);
+			goto out;
+		}
+		yaffs_gross_lock(dev);
+		offset++;
+		f->f_pos++;
+	}
+	if (offset == 1) {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_readdir: entry .. ino %d",
+			(int)f->f_dentry->d_parent->d_inode->i_ino);
+		yaffs_gross_unlock(dev);
+		if (filldir(dirent, "..", 2, offset,
+			    f->f_dentry->d_parent->d_inode->i_ino,
+			    DT_DIR) < 0) {
+			yaffs_gross_lock(dev);
+			goto out;
+		}
+		yaffs_gross_lock(dev);
+		offset++;
+		f->f_pos++;
+	}
+
+	curoffs = 1;
+
+	/* If the directory has changed since the open or last call to
+	   readdir, rewind to after the 2 canned entries. */
+	if (f->f_version != inode->i_version) {
+		offset = 2;
+		f->f_pos = offset;
+		f->f_version = inode->i_version;
+	}
+
+	while (sc->next_return) {
+		curoffs++;
+		l = sc->next_return;
+		if (curoffs >= offset) {
+			int this_inode = yaffs_get_obj_inode(l);
+			int this_type = yaffs_get_obj_type(l);
+
+			yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1);
+			yaffs_trace(YAFFS_TRACE_OS,
+				"yaffs_readdir: %s inode %d",
+				name, yaffs_get_obj_inode(l));
+
+			yaffs_gross_unlock(dev);
+
+			if (filldir(dirent,
+				    name,
+				    strlen(name),
+				    offset, this_inode, this_type) < 0) {
+				yaffs_gross_lock(dev);
+				goto out;
+			}
+
+			yaffs_gross_lock(dev);
+
+			offset++;
+			f->f_pos++;
+		}
+		yaffs_search_advance(sc);
+	}
+
+out:
+	yaffs_search_end(sc);
+	yaffs_dev_to_lc(dev)->readdir_process = NULL;
 	yaffs_gross_unlock(dev);
+
+	return ret_val;
+}
+
+static const struct file_operations yaffs_dir_operations = {
+	.read = generic_read_dir,
+	.readdir = yaffs_readdir,
+	.fsync = yaffs_sync_object,
+	.llseek = generic_file_llseek,
+};
+
+static void yaffs_fill_inode_from_obj(struct inode *inode,
+				      struct yaffs_obj *obj)
+{
+	if (inode && obj) {
+
+		/* Check mode against the variant type and attempt to repair if broken. */
+		u32 mode = obj->yst_mode;
+		switch (obj->variant_type) {
+		case YAFFS_OBJECT_TYPE_FILE:
+			if (!S_ISREG(mode)) {
+				obj->yst_mode &= ~S_IFMT;
+				obj->yst_mode |= S_IFREG;
+			}
+
+			break;
+		case YAFFS_OBJECT_TYPE_SYMLINK:
+			if (!S_ISLNK(mode)) {
+				obj->yst_mode &= ~S_IFMT;
+				obj->yst_mode |= S_IFLNK;
+			}
+
+			break;
+		case YAFFS_OBJECT_TYPE_DIRECTORY:
+			if (!S_ISDIR(mode)) {
+				obj->yst_mode &= ~S_IFMT;
+				obj->yst_mode |= S_IFDIR;
+			}
+
+			break;
+		case YAFFS_OBJECT_TYPE_UNKNOWN:
+		case YAFFS_OBJECT_TYPE_HARDLINK:
+		case YAFFS_OBJECT_TYPE_SPECIAL:
+		default:
+			/* TODO? */
+			break;
+		}
+
+		inode->i_flags |= S_NOATIME;
+
+		inode->i_ino = obj->obj_id;
+		inode->i_mode = obj->yst_mode;
+		inode->i_uid = obj->yst_uid;
+		inode->i_gid = obj->yst_gid;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
+		inode->i_blksize = inode->i_sb->s_blocksize;
+#endif
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+
+		inode->i_rdev = old_decode_dev(obj->yst_rdev);
+		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
+		inode->i_atime.tv_nsec = 0;
+		inode->i_mtime.tv_sec = (time_t) obj->yst_mtime;
+		inode->i_mtime.tv_nsec = 0;
+		inode->i_ctime.tv_sec = (time_t) obj->yst_ctime;
+		inode->i_ctime.tv_nsec = 0;
+#else
+		inode->i_rdev = obj->yst_rdev;
+		inode->i_atime = obj->yst_atime;
+		inode->i_mtime = obj->yst_mtime;
+		inode->i_ctime = obj->yst_ctime;
+#endif
+		inode->i_size = yaffs_get_obj_length(obj);
+		inode->i_blocks = (inode->i_size + 511) >> 9;
+
+		set_nlink(inode, yaffs_get_obj_link_count(obj));
+
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_fill_inode mode %x uid %d gid %d size %lld count %d",
+			inode->i_mode, inode->i_uid, inode->i_gid,
+			inode->i_size, atomic_read(&inode->i_count));
+
+		switch (obj->yst_mode & S_IFMT) {
+		default:	/* fifo, device or socket */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+			init_special_inode(inode, obj->yst_mode,
+					   old_decode_dev(obj->yst_rdev));
+#else
+			init_special_inode(inode, obj->yst_mode,
+					   (dev_t) (obj->yst_rdev));
+#endif
+			break;
+		case S_IFREG:	/* file */
+			inode->i_op = &yaffs_file_inode_operations;
+			inode->i_fop = &yaffs_file_operations;
+			inode->i_mapping->a_ops =
+			    &yaffs_file_address_operations;
+			break;
+		case S_IFDIR:	/* directory */
+			inode->i_op = &yaffs_dir_inode_operations;
+			inode->i_fop = &yaffs_dir_operations;
+			break;
+		case S_IFLNK:	/* symlink */
+			inode->i_op = &yaffs_symlink_inode_operations;
+			break;
+		}
+
+		yaffs_inode_to_obj_lv(inode) = obj;
+
+		obj->my_inode = inode;
+
+	} else {
+		yaffs_trace(YAFFS_TRACE_OS,
+			"yaffs_fill_inode invalid parameters");
+	}
+
+}
+
+
+
+/*
+ * yaffs background thread functions .
+ * yaffs_bg_thread_fn() the thread function
+ * yaffs_bg_start() launches the background thread.
+ * yaffs_bg_stop() cleans up the background thread.
+ *
+ * NB:
+ * The thread should only run after the yaffs is initialised
+ * The thread should be stopped before yaffs is unmounted.
+ * The thread should not do any writing while the fs is in read only.
+ */
+
+static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev)
+{
+	unsigned erased_chunks =
+	    dev->n_erased_blocks * dev->param.chunks_per_block;
+	struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+	unsigned scattered = 0;	/* Free chunks not in an erased block */
+
+	if (erased_chunks < dev->n_free_chunks)
+		scattered = (dev->n_free_chunks - erased_chunks);
+
+	if (!context->bg_running)
+		return 0;
+	else if (scattered < (dev->param.chunks_per_block * 2))
+		return 0;
+	else if (erased_chunks > dev->n_free_chunks / 2)
+		return 0;
+	else if (erased_chunks > dev->n_free_chunks / 4)
+		return 1;
+	else
+		return 2;
+}
+
+#ifdef YAFFS_COMPILE_BACKGROUND
+
+void yaffs_background_waker(unsigned long data)
+{
+	wake_up_process((struct task_struct *)data);
+}
+
+static int yaffs_bg_thread_fn(void *data)
+{
+	struct yaffs_dev *dev = (struct yaffs_dev *)data;
+	struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+	unsigned long now = jiffies;
+	unsigned long next_dir_update = now;
+	unsigned long next_gc = now;
+	unsigned long expires;
+	unsigned int urgency;
+
+	int gc_result;
+	struct timer_list timer;
+
+	yaffs_trace(YAFFS_TRACE_BACKGROUND,
+		"yaffs_background starting for dev %p", (void *)dev);
+
+#ifdef YAFFS_COMPILE_FREEZER
+	set_freezable();
+#endif
+	while (context->bg_running) {
+		yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background");
+
+		if (kthread_should_stop())
+			break;
+
+#ifdef YAFFS_COMPILE_FREEZER
+		if (try_to_freeze())
+			continue;
+#endif
+		yaffs_gross_lock(dev);
+
+		now = jiffies;
+
+		if (time_after(now, next_dir_update) && yaffs_bg_enable) {
+			yaffs_update_dirty_dirs(dev);
+			next_dir_update = now + HZ;
+		}
+
+		if (time_after(now, next_gc) && yaffs_bg_enable) {
+			if (!dev->is_checkpointed) {
+				urgency = yaffs_bg_gc_urgency(dev);
+				gc_result = yaffs_bg_gc(dev, urgency);
+				if (urgency > 1)
+					next_gc = now + HZ / 20 + 1;
+				else if (urgency > 0)
+					next_gc = now + HZ / 10 + 1;
+				else
+					next_gc = now + HZ * 2;
+			} else	{
+			        /*
+				 * gc not running so set to next_dir_update
+				 * to cut down on wake ups
+				 */
+				next_gc = next_dir_update;
+                        }
+		}
+		yaffs_gross_unlock(dev);
+#if 1
+		expires = next_dir_update;
+		if (time_before(next_gc, expires))
+			expires = next_gc;
+		if (time_before(expires, now))
+			expires = now + HZ;
+
+		Y_INIT_TIMER(&timer);
+		timer.expires = expires + 1;
+		timer.data = (unsigned long)current;
+		timer.function = yaffs_background_waker;
+
+		set_current_state(TASK_INTERRUPTIBLE);
+		add_timer(&timer);
+		schedule();
+		del_timer_sync(&timer);
+#else
+		msleep(10);
+#endif
+	}
+
+	return 0;
+}
+
+static int yaffs_bg_start(struct yaffs_dev *dev)
+{
+	int retval = 0;
+	struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+
+	if (dev->read_only)
+		return -1;
+
+	context->bg_running = 1;
+
+	context->bg_thread = kthread_run(yaffs_bg_thread_fn,
+					 (void *)dev, "yaffs-bg-%d",
+					 context->mount_id);
+
+	if (IS_ERR(context->bg_thread)) {
+		retval = PTR_ERR(context->bg_thread);
+		context->bg_thread = NULL;
+		context->bg_running = 0;
+	}
+	return retval;
+}
+
+static void yaffs_bg_stop(struct yaffs_dev *dev)
+{
+	struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev);
+
+	ctxt->bg_running = 0;
+
+	if (ctxt->bg_thread) {
+		kthread_stop(ctxt->bg_thread);
+		ctxt->bg_thread = NULL;
+	}
+}
+#else
+static int yaffs_bg_thread_fn(void *data)
+{
+	return 0;
+}
+
+static int yaffs_bg_start(struct yaffs_dev *dev)
+{
 	return 0;
 }
 
-/*
- * The VFS layer already does all the dentry stuff for rename.
- *
- * NB: POSIX says you can rename an object over an old object of the same name
- */
-static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
-			struct inode *new_dir, struct dentry *new_dentry)
+static void yaffs_bg_stop(struct yaffs_dev *dev)
+{
+}
+#endif
+
+
+static void yaffs_flush_inodes(struct super_block *sb)
+{
+	struct inode *iptr;
+	struct yaffs_obj *obj;
+
+	list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) {
+		obj = yaffs_inode_to_obj(iptr);
+		if (obj) {
+			yaffs_trace(YAFFS_TRACE_OS,
+				"flushing obj %d",
+				obj->obj_id);
+			yaffs_flush_file(obj, 1, 0);
+		}
+	}
+}
+
+static void yaffs_flush_super(struct super_block *sb, int do_checkpoint)
+{
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+	if (!dev)
+		return;
+
+	yaffs_flush_inodes(sb);
+	yaffs_update_dirty_dirs(dev);
+	yaffs_flush_whole_cache(dev);
+	if (do_checkpoint)
+		yaffs_checkpoint_save(dev);
+}
+
+static LIST_HEAD(yaffs_context_list);
+struct mutex yaffs_context_lock;
+
+static void yaffs_put_super(struct super_block *sb)
 {
-	struct yaffs_dev *dev;
-	int ret_val = YAFFS_FAIL;
-	struct yaffs_obj *target;
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
 
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_rename");
-	dev = yaffs_inode_to_obj(old_dir)->my_dev;
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
+			"yaffs_put_super");
+
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+		"Shutting down yaffs background thread");
+	yaffs_bg_stop(dev);
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+		"yaffs background thread shut down");
 
 	yaffs_gross_lock(dev);
 
-	/* Check if the target is an existing directory that is not empty. */
-	target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir),
-				    new_dentry->d_name.name);
+	yaffs_flush_super(sb, 1);
 
-	if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
-	    !list_empty(&target->variant.dir_variant.children)) {
+	yaffs_deinitialise(dev);
 
-		yaffs_trace(YAFFS_TRACE_OS, "target is non-empty dir");
+	yaffs_gross_unlock(dev);
 
-		ret_val = YAFFS_FAIL;
-	} else {
-		/* Now does unlinking internally using shadowing mechanism */
-		yaffs_trace(YAFFS_TRACE_OS, "calling yaffs_rename_obj");
+	mutex_lock(&yaffs_context_lock);
+	list_del_init(&(yaffs_dev_to_lc(dev)->context_list));
+	mutex_unlock(&yaffs_context_lock);
 
-		ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir),
-					   old_dentry->d_name.name,
-					   yaffs_inode_to_obj(new_dir),
-					   new_dentry->d_name.name);
+	if (yaffs_dev_to_lc(dev)->spare_buffer) {
+		kfree(yaffs_dev_to_lc(dev)->spare_buffer);
+		yaffs_dev_to_lc(dev)->spare_buffer = NULL;
 	}
-	yaffs_gross_unlock(dev);
 
-	if (ret_val == YAFFS_OK) {
-		if (target)
-			inode_dec_link_count(new_dentry->d_inode);
+	kfree(dev);
 
-		update_dir_time(old_dir);
-		if (old_dir != new_dir)
-			update_dir_time(new_dir);
-		return 0;
-	} else {
-		return -ENOTEMPTY;
-	}
+	yaffs_put_mtd_device(mtd);
+
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
+			"yaffs_put_super done");
 }
 
-static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
+
+static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev)
 {
-	struct inode *inode = dentry->d_inode;
-	int error = 0;
-	struct yaffs_dev *dev;
+	return yaffs_gc_control;
+}
 
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_setattr of object %d",
-		yaffs_inode_to_obj(inode)->obj_id);
-#if 0
-	/* Fail if a requested resize >= 2GB */
-	if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31))
-		error = -EINVAL;
-#endif
 
-	if (error == 0)
-		error = inode_change_ok(inode, attr);
-	if (error == 0) {
-		int result;
-		if (!error) {
-			error = yaffs_vfs_setattr(inode, attr);
-			yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called");
-			if (attr->ia_valid & ATTR_SIZE) {
-				yaffs_vfs_setsize(inode, attr->ia_size);
-				inode->i_blocks = (inode->i_size + 511) >> 9;
-			}
-		}
-		dev = yaffs_inode_to_obj(inode)->my_dev;
-		if (attr->ia_valid & ATTR_SIZE) {
-			yaffs_trace(YAFFS_TRACE_OS,
-				"resize to %d(%x)",
-				(int)(attr->ia_size),
-				(int)(attr->ia_size));
-		}
-		yaffs_gross_lock(dev);
-		result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr);
-		if (result == YAFFS_OK) {
-			error = 0;
-		} else {
-			error = -EPERM;
-		}
-		yaffs_gross_unlock(dev);
+#ifdef YAFFS_COMPILE_EXPORTFS
 
-	}
+static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino,
+					  uint32_t generation)
+{
+	return Y_IGET(sb, ino);
+}
 
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error);
+static struct dentry *yaffs2_fh_to_dentry(struct super_block *sb,
+					  struct fid *fid, int fh_len,
+					  int fh_type)
+{
+	return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
+				    yaffs2_nfs_get_inode);
+}
 
-	return error;
+static struct dentry *yaffs2_fh_to_parent(struct super_block *sb,
+					  struct fid *fid, int fh_len,
+					  int fh_type)
+{
+	return generic_fh_to_parent(sb, fid, fh_len, fh_type,
+				    yaffs2_nfs_get_inode);
 }
 
-static int yaffs_setxattr(struct dentry *dentry, const char *name,
-		   const void *value, size_t size, int flags)
+struct dentry *yaffs2_get_parent(struct dentry *dentry)
 {
-	struct inode *inode = dentry->d_inode;
-	int error = 0;
-	struct yaffs_dev *dev;
-	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
 
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id);
+	struct super_block *sb = dentry->d_inode->i_sb;
+	struct dentry *parent = ERR_PTR(-ENOENT);
+	struct inode *inode;
+	unsigned long parent_ino;
+	struct yaffs_obj *d_obj;
+	struct yaffs_obj *parent_obj;
 
-	if (error == 0) {
-		int result;
-		dev = obj->my_dev;
-		yaffs_gross_lock(dev);
-		result = yaffs_set_xattrib(obj, name, value, size, flags);
-		if (result == YAFFS_OK)
-			error = 0;
-		else if (result < 0)
-			error = result;
-		yaffs_gross_unlock(dev);
+	d_obj = yaffs_inode_to_obj(dentry->d_inode);
+
+	if (d_obj) {
+		parent_obj = d_obj->parent;
+		if (parent_obj) {
+			parent_ino = yaffs_get_obj_inode(parent_obj);
+			inode = Y_IGET(sb, parent_ino);
 
+			if (IS_ERR(inode)) {
+				parent = ERR_CAST(inode);
+			} else {
+				parent = d_obtain_alias(inode);
+				if (!IS_ERR(parent)) {
+					parent = ERR_PTR(-ENOMEM);
+					iput(inode);
+				}
+			}
+		}
 	}
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error);
 
-	return error;
+	return parent;
 }
 
-static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name,
-			void *buff, size_t size)
+/* Just declare a zero structure as a NULL value implies
+ * using the default functions of exportfs.
+ */
+
+static struct export_operations yaffs_export_ops = {
+	.fh_to_dentry = yaffs2_fh_to_dentry,
+	.fh_to_parent = yaffs2_fh_to_parent,
+	.get_parent = yaffs2_get_parent,
+};
+
+#endif
+
+static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj)
 {
-	struct inode *inode = dentry->d_inode;
-	int error = 0;
+	/* Clear the association between the inode and
+	 * the struct yaffs_obj.
+	 */
+	obj->my_inode = NULL;
+	yaffs_inode_to_obj_lv(inode) = NULL;
+
+	/* If the object freeing was deferred, then the real
+	 * free happens now.
+	 * This should fix the inode inconsistency problem.
+	 */
+	yaffs_handle_defered_free(obj);
+}
+
+#ifdef YAFFS_HAS_EVICT_INODE
+/* yaffs_evict_inode combines into one operation what was previously done in
+ * yaffs_clear_inode() and yaffs_delete_inode()
+ *
+ */
+static void yaffs_evict_inode(struct inode *inode)
+{
+	struct yaffs_obj *obj;
 	struct yaffs_dev *dev;
-	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+	int deleteme = 0;
+
+	obj = yaffs_inode_to_obj(inode);
 
 	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_getxattr \"%s\" from object %d",
-		name, obj->obj_id);
+		"yaffs_evict_inode: ino %d, count %d %s",
+		(int)inode->i_ino, atomic_read(&inode->i_count),
+		obj ? "object exists" : "null object");
 
-	if (error == 0) {
+	if (!inode->i_nlink && !is_bad_inode(inode))
+		deleteme = 1;
+	truncate_inode_pages(&inode->i_data, 0);
+	Y_CLEAR_INODE(inode);
+
+	if (deleteme && obj) {
 		dev = obj->my_dev;
 		yaffs_gross_lock(dev);
-		error = yaffs_get_xattrib(obj, name, buff, size);
+		yaffs_del_obj(obj);
+		yaffs_gross_unlock(dev);
+	}
+	if (obj) {
+		dev = obj->my_dev;
+		yaffs_gross_lock(dev);
+		yaffs_unstitch_obj(inode, obj);
 		yaffs_gross_unlock(dev);
-
 	}
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error);
-
-	return error;
 }
+#else
 
-static int yaffs_removexattr(struct dentry *dentry, const char *name)
+/* clear is called to tell the fs to release any per-inode data it holds.
+ * The object might still exist on disk and is just being thrown out of the cache
+ * or else the object has actually been deleted and we're being called via
+ * the chain
+ *   yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode()
+ */
+
+static void yaffs_clear_inode(struct inode *inode)
 {
-	struct inode *inode = dentry->d_inode;
-	int error = 0;
+	struct yaffs_obj *obj;
 	struct yaffs_dev *dev;
-	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+
+	obj = yaffs_inode_to_obj(inode);
 
 	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_removexattr of object %d", obj->obj_id);
+		"yaffs_clear_inode: ino %d, count %d %s",
+		(int)inode->i_ino, atomic_read(&inode->i_count),
+		obj ? "object exists" : "null object");
 
-	if (error == 0) {
-		int result;
+	if (obj) {
 		dev = obj->my_dev;
 		yaffs_gross_lock(dev);
-		result = yaffs_remove_xattrib(obj, name);
-		if (result == YAFFS_OK)
-			error = 0;
-		else if (result < 0)
-			error = result;
+		yaffs_unstitch_obj(inode, obj);
 		yaffs_gross_unlock(dev);
-
 	}
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_removexattr done returning %d", error);
 
-	return error;
 }
 
-static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size)
+/* delete is called when the link count is zero and the inode
+ * is put (ie. nobody wants to know about it anymore, time to
+ * delete the file).
+ * NB Must call clear_inode()
+ */
+static void yaffs_delete_inode(struct inode *inode)
 {
-	struct inode *inode = dentry->d_inode;
-	int error = 0;
-	struct yaffs_dev *dev;
 	struct yaffs_obj *obj = yaffs_inode_to_obj(inode);
+	struct yaffs_dev *dev;
 
 	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_listxattr of object %d", obj->obj_id);
+		"yaffs_delete_inode: ino %d, count %d %s",
+		(int)inode->i_ino, atomic_read(&inode->i_count),
+		obj ? "object exists" : "null object");
 
-	if (error == 0) {
+	if (obj) {
 		dev = obj->my_dev;
 		yaffs_gross_lock(dev);
-		error = yaffs_list_xattrib(obj, buff, size);
+		yaffs_del_obj(obj);
 		yaffs_gross_unlock(dev);
-
 	}
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_listxattr done returning %d", error);
-
-	return error;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13))
+	truncate_inode_pages(&inode->i_data, 0);
+#endif
+	clear_inode(inode);
 }
+#endif
+
+
 
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
@@ -2100,277 +2354,82 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
 		bytes_in_dev =
 		    ((uint64_t)
 		     ((dev->param.end_block - dev->param.start_block +
-		       1))) * ((uint64_t) (dev->param.chunks_per_block *
-					   dev->data_bytes_per_chunk));
-
-		do_div(bytes_in_dev, sb->s_blocksize);	/* bytes_in_dev becomes the number of blocks */
-		buf->f_blocks = bytes_in_dev;
-
-		bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) *
-		    ((uint64_t) (dev->data_bytes_per_chunk));
-
-		do_div(bytes_free, sb->s_blocksize);
-
-		buf->f_bfree = bytes_free;
-
-	} else if (sb->s_blocksize > dev->data_bytes_per_chunk) {
-
-		buf->f_blocks =
-		    (dev->param.end_block - dev->param.start_block + 1) *
-		    dev->param.chunks_per_block /
-		    (sb->s_blocksize / dev->data_bytes_per_chunk);
-		buf->f_bfree =
-		    yaffs_get_n_free_chunks(dev) /
-		    (sb->s_blocksize / dev->data_bytes_per_chunk);
-	} else {
-		buf->f_blocks =
-		    (dev->param.end_block - dev->param.start_block + 1) *
-		    dev->param.chunks_per_block *
-		    (dev->data_bytes_per_chunk / sb->s_blocksize);
-
-		buf->f_bfree =
-		    yaffs_get_n_free_chunks(dev) *
-		    (dev->data_bytes_per_chunk / sb->s_blocksize);
-	}
-
-	buf->f_files = 0;
-	buf->f_ffree = 0;
-	buf->f_bavail = buf->f_bfree;
-
-	yaffs_gross_unlock(dev);
-	return 0;
-}
-
-static void yaffs_flush_inodes(struct super_block *sb)
-{
-	struct inode *iptr;
-	struct yaffs_obj *obj;
-
-	list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) {
-		obj = yaffs_inode_to_obj(iptr);
-		if (obj) {
-			yaffs_trace(YAFFS_TRACE_OS,
-				"flushing obj %d",
-				obj->obj_id);
-			yaffs_flush_file(obj, 1, 0);
-		}
-	}
-}
-
-static void yaffs_flush_super(struct super_block *sb, int do_checkpoint)
-{
-	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-	if (!dev)
-		return;
-
-	yaffs_flush_inodes(sb);
-	yaffs_update_dirty_dirs(dev);
-	yaffs_flush_whole_cache(dev);
-	if (do_checkpoint)
-		yaffs_checkpoint_save(dev);
-}
-
-static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev)
-{
-	unsigned erased_chunks =
-	    dev->n_erased_blocks * dev->param.chunks_per_block;
-	struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
-	unsigned scattered = 0;	/* Free chunks not in an erased block */
-
-	if (erased_chunks < dev->n_free_chunks)
-		scattered = (dev->n_free_chunks - erased_chunks);
-
-	if (!context->bg_running)
-		return 0;
-	else if (scattered < (dev->param.chunks_per_block * 2))
-		return 0;
-	else if (erased_chunks > dev->n_free_chunks / 2)
-		return 0;
-	else if (erased_chunks > dev->n_free_chunks / 4)
-		return 1;
-	else
-		return 2;
-}
-
-static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint)
-{
-
-	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-	unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4);
-	unsigned gc_urgent = yaffs_bg_gc_urgency(dev);
-	int do_checkpoint;
-
-	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
-		"yaffs_do_sync_fs: gc-urgency %d %s %s%s",
-		gc_urgent,
-		sb->s_dirt ? "dirty" : "clean",
-		request_checkpoint ? "checkpoint requested" : "no checkpoint",
-		oneshot_checkpoint ? " one-shot" : "");
-
-	yaffs_gross_lock(dev);
-	do_checkpoint = ((request_checkpoint && !gc_urgent) ||
-			 oneshot_checkpoint) && !dev->is_checkpointed;
-
-	if (sb->s_dirt || do_checkpoint) {
-		yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint);
-		sb->s_dirt = 0;
-		if (oneshot_checkpoint)
-			yaffs_auto_checkpoint &= ~4;
-	}
-	yaffs_gross_unlock(dev);
-
-	return 0;
-}
-
-/*
- * yaffs background thread functions .
- * yaffs_bg_thread_fn() the thread function
- * yaffs_bg_start() launches the background thread.
- * yaffs_bg_stop() cleans up the background thread.
- *
- * NB:
- * The thread should only run after the yaffs is initialised
- * The thread should be stopped before yaffs is unmounted.
- * The thread should not do any writing while the fs is in read only.
- */
-
-#ifdef YAFFS_COMPILE_BACKGROUND
-
-void yaffs_background_waker(unsigned long data)
-{
-	wake_up_process((struct task_struct *)data);
-}
-
-static int yaffs_bg_thread_fn(void *data)
-{
-	struct yaffs_dev *dev = (struct yaffs_dev *)data;
-	struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
-	unsigned long now = jiffies;
-	unsigned long next_dir_update = now;
-	unsigned long next_gc = now;
-	unsigned long expires;
-	unsigned int urgency;
-
-	int gc_result;
-	struct timer_list timer;
-
-	yaffs_trace(YAFFS_TRACE_BACKGROUND,
-		"yaffs_background starting for dev %p", (void *)dev);
-
-#ifdef YAFFS_COMPILE_FREEZER
-	set_freezable();
-#endif
-	while (context->bg_running) {
-		yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background");
-
-		if (kthread_should_stop())
-			break;
-
-#ifdef YAFFS_COMPILE_FREEZER
-		if (try_to_freeze())
-			continue;
-#endif
-		yaffs_gross_lock(dev);
-
-		now = jiffies;
-
-		if (time_after(now, next_dir_update) && yaffs_bg_enable) {
-			yaffs_update_dirty_dirs(dev);
-			next_dir_update = now + HZ;
-		}
-
-		if (time_after(now, next_gc) && yaffs_bg_enable) {
-			if (!dev->is_checkpointed) {
-				urgency = yaffs_bg_gc_urgency(dev);
-				gc_result = yaffs_bg_gc(dev, urgency);
-				if (urgency > 1)
-					next_gc = now + HZ / 20 + 1;
-				else if (urgency > 0)
-					next_gc = now + HZ / 10 + 1;
-				else
-					next_gc = now + HZ * 2;
-			} else	{
-			        /*
-				 * gc not running so set to next_dir_update
-				 * to cut down on wake ups
-				 */
-				next_gc = next_dir_update;
-                        }
-		}
-		yaffs_gross_unlock(dev);
-#if 1
-		expires = next_dir_update;
-		if (time_before(next_gc, expires))
-			expires = next_gc;
-		if (time_before(expires, now))
-			expires = now + HZ;
-
-		Y_INIT_TIMER(&timer);
-		timer.expires = expires + 1;
-		timer.data = (unsigned long)current;
-		timer.function = yaffs_background_waker;
+		       1))) * ((uint64_t) (dev->param.chunks_per_block *
+					   dev->data_bytes_per_chunk));
 
-		set_current_state(TASK_INTERRUPTIBLE);
-		add_timer(&timer);
-		schedule();
-		del_timer_sync(&timer);
-#else
-		msleep(10);
-#endif
-	}
+		do_div(bytes_in_dev, sb->s_blocksize);	/* bytes_in_dev becomes the number of blocks */
+		buf->f_blocks = bytes_in_dev;
 
-	return 0;
-}
+		bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) *
+		    ((uint64_t) (dev->data_bytes_per_chunk));
 
-static int yaffs_bg_start(struct yaffs_dev *dev)
-{
-	int retval = 0;
-	struct yaffs_linux_context *context = yaffs_dev_to_lc(dev);
+		do_div(bytes_free, sb->s_blocksize);
 
-	if (dev->read_only)
-		return -1;
+		buf->f_bfree = bytes_free;
 
-	context->bg_running = 1;
+	} else if (sb->s_blocksize > dev->data_bytes_per_chunk) {
 
-	context->bg_thread = kthread_run(yaffs_bg_thread_fn,
-					 (void *)dev, "yaffs-bg-%d",
-					 context->mount_id);
+		buf->f_blocks =
+		    (dev->param.end_block - dev->param.start_block + 1) *
+		    dev->param.chunks_per_block /
+		    (sb->s_blocksize / dev->data_bytes_per_chunk);
+		buf->f_bfree =
+		    yaffs_get_n_free_chunks(dev) /
+		    (sb->s_blocksize / dev->data_bytes_per_chunk);
+	} else {
+		buf->f_blocks =
+		    (dev->param.end_block - dev->param.start_block + 1) *
+		    dev->param.chunks_per_block *
+		    (dev->data_bytes_per_chunk / sb->s_blocksize);
 
-	if (IS_ERR(context->bg_thread)) {
-		retval = PTR_ERR(context->bg_thread);
-		context->bg_thread = NULL;
-		context->bg_running = 0;
+		buf->f_bfree =
+		    yaffs_get_n_free_chunks(dev) *
+		    (dev->data_bytes_per_chunk / sb->s_blocksize);
 	}
-	return retval;
+
+	buf->f_files = 0;
+	buf->f_ffree = 0;
+	buf->f_bavail = buf->f_bfree;
+
+	yaffs_gross_unlock(dev);
+	return 0;
 }
 
-static void yaffs_bg_stop(struct yaffs_dev *dev)
+
+
+static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint)
 {
-	struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev);
 
-	ctxt->bg_running = 0;
+	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
+	unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4);
+	unsigned gc_urgent = yaffs_bg_gc_urgency(dev);
+	int do_checkpoint;
+	int dirty = yaffs_check_super_dirty(dev);
 
-	if (ctxt->bg_thread) {
-		kthread_stop(ctxt->bg_thread);
-		ctxt->bg_thread = NULL;
+	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
+		"yaffs_do_sync_fs: gc-urgency %d %s %s%s",
+		gc_urgent,
+		dirty ? "dirty" : "clean",
+		request_checkpoint ? "checkpoint requested" : "no checkpoint",
+		oneshot_checkpoint ? " one-shot" : "");
+
+	yaffs_gross_lock(dev);
+	do_checkpoint = ((request_checkpoint && !gc_urgent) ||
+			 oneshot_checkpoint) && !dev->is_checkpointed;
+
+	if (dirty || do_checkpoint) {
+		yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint);
+		yaffs_clear_super_dirty(dev);
+		if (oneshot_checkpoint)
+			yaffs_auto_checkpoint &= ~4;
 	}
-}
-#else
-static int yaffs_bg_thread_fn(void *data)
-{
-	return 0;
-}
+	yaffs_gross_unlock(dev);
 
-static int yaffs_bg_start(struct yaffs_dev *dev)
-{
 	return 0;
 }
 
-static void yaffs_bg_stop(struct yaffs_dev *dev)
-{
-}
-#endif
 
+#ifdef YAFFS_HAS_WRITE_SUPER
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 static void yaffs_write_super(struct super_block *sb)
 #else
@@ -2389,6 +2448,7 @@ static int yaffs_write_super(struct super_block *sb)
 	return 0;
 #endif
 }
+#endif
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 static int yaffs_sync_fs(struct super_block *sb, int wait)
@@ -2406,122 +2466,29 @@ static int yaffs_sync_fs(struct super_block *sb)
 	return 0;
 }
 
-#ifdef YAFFS_USE_OWN_IGET
-
-static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
-{
-	struct inode *inode;
-	struct yaffs_obj *obj;
-	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino);
-
-	inode = iget_locked(sb, ino);
-	if (!inode)
-		return ERR_PTR(-ENOMEM);
-	if (!(inode->i_state & I_NEW))
-		return inode;
-
-	/* NB This is called as a side effect of other functions, but
-	 * we had to release the lock to prevent deadlocks, so
-	 * need to lock again.
-	 */
-
-	yaffs_gross_lock(dev);
-
-	obj = yaffs_find_by_number(dev, inode->i_ino);
 
-	yaffs_fill_inode_from_obj(inode, obj);
-
-	yaffs_gross_unlock(dev);
 
-	unlock_new_inode(inode);
-	return inode;
-}
+static const struct super_operations yaffs_super_ops = {
+	.statfs = yaffs_statfs,
 
+#ifndef YAFFS_USE_OWN_IGET
+	.read_inode = yaffs_read_inode,
+#endif
+#ifdef YAFFS_HAS_PUT_INODE
+	.put_inode = yaffs_put_inode,
+#endif
+	.put_super = yaffs_put_super,
+#ifdef YAFFS_HAS_EVICT_INODE
+	.evict_inode = yaffs_evict_inode,
 #else
-
-static void yaffs_read_inode(struct inode *inode)
-{
-	/* NB This is called as a side effect of other functions, but
-	 * we had to release the lock to prevent deadlocks, so
-	 * need to lock again.
-	 */
-
-	struct yaffs_obj *obj;
-	struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb);
-
-	yaffs_trace(YAFFS_TRACE_OS,
-		"yaffs_read_inode for %d", (int)inode->i_ino);
-
-	if (current != yaffs_dev_to_lc(dev)->readdir_process)
-		yaffs_gross_lock(dev);
-
-	obj = yaffs_find_by_number(dev, inode->i_ino);
-
-	yaffs_fill_inode_from_obj(inode, obj);
-
-	if (current != yaffs_dev_to_lc(dev)->readdir_process)
-		yaffs_gross_unlock(dev);
-}
-
+	.delete_inode = yaffs_delete_inode,
+	.clear_inode = yaffs_clear_inode,
 #endif
-
-static LIST_HEAD(yaffs_context_list);
-struct mutex yaffs_context_lock;
-
-static void yaffs_put_super(struct super_block *sb)
-{
-	struct yaffs_dev *dev = yaffs_super_to_dev(sb);
-	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-
-	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
-			"yaffs_put_super");
-
-	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
-		"Shutting down yaffs background thread");
-	yaffs_bg_stop(dev);
-	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
-		"yaffs background thread shut down");
-
-	yaffs_gross_lock(dev);
-
-	yaffs_flush_super(sb, 1);
-
-	yaffs_deinitialise(dev);
-
-	yaffs_gross_unlock(dev);
-
-	mutex_lock(&yaffs_context_lock);
-	list_del_init(&(yaffs_dev_to_lc(dev)->context_list));
-	mutex_unlock(&yaffs_context_lock);
-
-	if (yaffs_dev_to_lc(dev)->spare_buffer) {
-		kfree(yaffs_dev_to_lc(dev)->spare_buffer);
-		yaffs_dev_to_lc(dev)->spare_buffer = NULL;
-	}
-
-	kfree(dev);
-
-	if (mtd && mtd->sync)
-		mtd->sync(mtd);
-
-	if(mtd)
-		put_mtd_device(mtd);
-
-	yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS,
-			"yaffs_put_super done");
-}
-
-
-static void yaffs_touch_super(struct yaffs_dev *dev)
-{
-	struct super_block *sb = yaffs_dev_to_lc(dev)->super;
-
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_touch_super() sb = %p", sb);
-	if (sb)
-		sb->s_dirt = 1;
-}
+	.sync_fs = yaffs_sync_fs,
+#ifdef YAFFS_HAS_WRITE_SUPER
+	.write_super = yaffs_write_super,
+#endif
+};
 
 struct yaffs_options {
 	int inband_tags;
@@ -2603,6 +2570,24 @@ static int yaffs_parse_options(struct yaffs_options *options,
 	return error;
 }
 
+
+static struct dentry *yaffs_make_root(struct inode *inode)
+{
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0))
+	struct dentry *root = d_alloc_root(inode);
+
+	if (!root)
+		iput(inode);
+
+        return root;
+#else
+        return d_make_root(inode);
+#endif
+}
+
+
+
+
 static struct super_block *yaffs_internal_read_super(int yaffs_version,
 						     struct super_block *sb,
 						     void *data, int silent)
@@ -2676,41 +2661,14 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 		MAJOR(sb->s_dev), MINOR(sb->s_dev),
 		yaffs_devname(sb, devname_buf));
 
-	/* Check it's an mtd device..... */
-	if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)
-		return NULL;	/* This isn't an mtd device */
-
 	/* Get the device */
 	mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
 	if (!mtd) {
 		yaffs_trace(YAFFS_TRACE_ALWAYS,
-			"yaffs: MTD device #%u doesn't appear to exist",
+			"yaffs: MTD device %u either not valid or unavailable",
 			MINOR(sb->s_dev));
 		return NULL;
 	}
-	/* Check it's NAND */
-	if (mtd->type != MTD_NANDFLASH) {
-		yaffs_trace(YAFFS_TRACE_ALWAYS,
-			"yaffs: MTD device is not NAND it's type %d",
-			mtd->type);
-		return NULL;
-	}
-
-	yaffs_trace(YAFFS_TRACE_OS, " erase %p", mtd->erase);
-	yaffs_trace(YAFFS_TRACE_OS, " read %p", mtd->read);
-	yaffs_trace(YAFFS_TRACE_OS, " write %p", mtd->write);
-	yaffs_trace(YAFFS_TRACE_OS, " readoob %p", mtd->read_oob);
-	yaffs_trace(YAFFS_TRACE_OS, " writeoob %p", mtd->write_oob);
-	yaffs_trace(YAFFS_TRACE_OS, " block_isbad %p", mtd->block_isbad);
-	yaffs_trace(YAFFS_TRACE_OS, " block_markbad %p", mtd->block_markbad);
-	yaffs_trace(YAFFS_TRACE_OS, " %s %d", WRITE_SIZE_STR, WRITE_SIZE(mtd));
-	yaffs_trace(YAFFS_TRACE_OS, " oobsize %d", mtd->oobsize);
-	yaffs_trace(YAFFS_TRACE_OS, " erasesize %d", mtd->erasesize);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
-	yaffs_trace(YAFFS_TRACE_OS, " size %u", mtd->size);
-#else
-	yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size);
-#endif
 
 	if (yaffs_auto_select && yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) {
 		yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs2");
@@ -2724,54 +2682,8 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 		yaffs_version = 1;
 	}
 
-	if (yaffs_version == 2) {
-		/* Check for version 2 style functions */
-		if (!mtd->erase ||
-		    !mtd->block_isbad ||
-		    !mtd->block_markbad || !mtd->read || !mtd->write ||
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-		    !mtd->read_oob || !mtd->write_oob) {
-#else
-		    !mtd->write_ecc ||
-		    !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
-#endif
-			yaffs_trace(YAFFS_TRACE_ALWAYS,
-				"MTD device does not support required functions"
-			);
-			return NULL;
-		}
-
-		if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE ||
-		     mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
-		    !options.inband_tags) {
-			yaffs_trace(YAFFS_TRACE_ALWAYS,
-				"MTD device does not have the right page sizes"
-			);
-			return NULL;
-		}
-	} else {
-		/* Check for V1 style functions */
-		if (!mtd->erase || !mtd->read || !mtd->write ||
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-		    !mtd->read_oob || !mtd->write_oob) {
-#else
-		    !mtd->write_ecc ||
-		    !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
-#endif
-			yaffs_trace(YAFFS_TRACE_ALWAYS,
-				"MTD device does not support required functions"
-			);
-			return NULL;
-		}
-
-		if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
-		    mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
-			yaffs_trace(YAFFS_TRACE_ALWAYS,
-				"MTD device does not support have the right page sizes"
-			);
-			return NULL;
-		}
-	}
+	if(yaffs_verify_mtd(mtd, yaffs_version, options.inband_tags) < 0)
+		return NULL;
 
 	/* OK, so if we got here, we have an MTD that's NAND and looks
 	 * like it has the right capabilities
@@ -2877,7 +2789,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
 	yaffs_mtd_drv_install(dev);
 
-	param->sb_dirty_fn = yaffs_touch_super;
+	param->sb_dirty_fn = yaffs_set_super_dirty;
 	param->gc_control_fn = yaffs_gc_control_callback;
 
 	yaffs_dev_to_lc(dev)->super = sb;
@@ -2943,16 +2855,15 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
 	yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: got root inode");
 
-	root = d_alloc_root(inode);
-
-	yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: d_alloc_root done");
+	root = yaffs_make_root(inode);
 
-	if (!root) {
-		iput(inode);
+	if (!root)
 		return NULL;
-	}
+
 	sb->s_root = root;
-	sb->s_dirt = !dev->is_checkpointed;
+	if(!dev->is_checkpointed)
+		yaffs_set_super_dirty(dev);
+
 	yaffs_trace(YAFFS_TRACE_ALWAYS,
 		"yaffs_read_super: is_checkpointed %d",
 		dev->is_checkpointed);