From: Charles Manning Date: Mon, 10 Jan 2011 22:58:02 +0000 (+1300) Subject: Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2 X-Git-Tag: linux-mainline-patchset-4~5 X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=05f5305b2d17b0e2889338724b864cf80f309437;hp=1fff83304b27b26ff765c6ffef9d6f354eada46d Merge branch 'master' of ssh://aleph1.co.uk/home/aleph1/git/yaffs2 --- diff --git a/direct/python/yaffs_browser.py b/direct/python/yaffs_browser.py index effe5a3..462038d 100755 --- a/direct/python/yaffs_browser.py +++ b/direct/python/yaffs_browser.py @@ -16,6 +16,7 @@ import Tkinter as tk from yaffsfs import * #import examples import ctypes +from operator import itemgetter yaffs_start_up() yaffs_mount("/yaffs2/") @@ -105,9 +106,21 @@ def load_dir(): name_list_box.delete(0, tk.END) current_directory_dict=yaffs_ls(mount_list_text_variable.get()) print "new directory", current_directory_dict + + + ##copy directory into file box for x in range(0,len(current_directory_dict)): - name_list_box.insert(x,(current_directory_dict[x]["inodes"]+" "+ current_directory_dict[x]["type"]+" "+ current_directory_dict[x]["size"]+" "+ current_directory_dict[x]["path"]+" "+current_directory_dict[x]["extra_data"])) + permissions_string="" + if current_directory_dict[x]["permissions"] & yaffs_S_IREAD: + permissions_string ='r' + else : + permissions_string ='-' + if current_directory_dict[x]["permissions"] & yaffs_S_IWRITE: + permissions_string+='w' + else : + permissions_string+='-' + name_list_box.insert(x,(current_directory_dict[x]["inodes"]+" "+permissions_string+" "+ current_directory_dict[x]["type"]+" "+ current_directory_dict[x]["size"]+" "+ current_directory_dict[x]["path"]+" "+current_directory_dict[x]["extra_data"])) name_list_box.grid(column=0, row=1) return current_directory_dict @@ -193,20 +206,21 @@ def yaffs_ls(dname): fullname = dname + se.d_name st = yaffs_stat_struct() result = yaffs_lstat(fullname,byref(st)) - perms = st.st_mode & 0777 + #perms = st.st_mode & 0777 + perms = st.st_mode ftype = st.st_mode & yaffs_S_IFMT isFile = True if ftype == yaffs_S_IFREG else False isDir = True if ftype == yaffs_S_IFDIR else False isSymlink= True if ftype == yaffs_S_IFLNK else False if isFile : - ls_dict.append ({"type" :"file", "inodes" : str(se.d_ino), "permissions" : str(hex(perms)), "size": str(st.st_size), "path": fullname,"extra_data":""}) + ls_dict.append ({"type" :"file", "inodes" : str(se.d_ino), "permissions" : perms, "size": str(st.st_size), "path": fullname,"extra_data":""}) print "file st.st_mode:", st.st_mode elif isDir : print "dir st.st_mode:", st.st_mode - ls_dict.append({"type":"dir", "inodes" :str(se.d_ino), "permissions":str( hex(perms)),"size":"0", "path": fullname+"/", "extra_data":""}) + ls_dict.append({"type":"dir", "inodes" :str(se.d_ino), "permissions":perms,"size":"0", "path": fullname+"/", "extra_data":""}) elif isSymlink: print "symlink st.st_mode:", st.st_mode file_contents=ctypes.create_string_buffer(30) @@ -217,14 +231,14 @@ def yaffs_ls(dname): print "string", string, "###" - ls_dict.append ({"type" :"link", "inodes" : str(se.d_ino), "permissions" : str(hex(perms)), "size": str(st.st_size), "path": fullname, "extra_data":"> "+string}) + ls_dict.append ({"type" :"link", "inodes" : str(se.d_ino), "permissions" : perms, "size": str(st.st_size), "path": fullname, "extra_data":"> "+string}) else : print "unknown st.st_mode:", st.st_mode - ls_dict.append({ "type":"Other", "inodes":str(se.d_ino), "permissions":str( hex(perms)), "size":"0", "path": fullname,"extra_data":""}) + ls_dict.append({ "type":"Other", "inodes":str(se.d_ino), "permissions":perms, "size":"0", "path": fullname,"extra_data":""}) sep = yaffs_readdir(dc) yaffs_closedir(dc) - return ls_dict + return sorted(ls_dict,key=itemgetter("path")) else: print "Could not open directory" return -1 diff --git a/direct/timothy_tests/linux_tests/mkdir_link b/direct/timothy_tests/linux_tests/mkdir_link new file mode 100755 index 0000000..7f92f37 Binary files /dev/null and b/direct/timothy_tests/linux_tests/mkdir_link differ diff --git a/direct/timothy_tests/linux_tests/mkdir_link.c b/direct/timothy_tests/linux_tests/mkdir_link.c new file mode 100644 index 0000000..d466958 --- /dev/null +++ b/direct/timothy_tests/linux_tests/mkdir_link.c @@ -0,0 +1,18 @@ +#include +#include + + +int main() +{ + int output=0; + int error_code =0 ; + output =symlink("timothy/home/tests/new_dir" "timothy/home/test/new_dir_link"); + output=mkdir("timothy/home/test/new_dir_link" ); + printf("output %d\n",output); + if (output <0 ) { + error_code = errno; + printf("error code %d\n",error_code); + printf("Error description is : %s\n",strerror(errno)); + } + return 0; +} diff --git a/direct/timothy_tests/linux_tests/mkdir_link.h b/direct/timothy_tests/linux_tests/mkdir_link.h new file mode 100644 index 0000000..e69de29 diff --git a/direct/timothy_tests/linux_tests/rename b/direct/timothy_tests/linux_tests/rename new file mode 100755 index 0000000..a168978 Binary files /dev/null and b/direct/timothy_tests/linux_tests/rename differ diff --git a/direct/timothy_tests/linux_tests/rename.c b/direct/timothy_tests/linux_tests/rename.c new file mode 100644 index 0000000..9c40c2f --- /dev/null +++ b/direct/timothy_tests/linux_tests/rename.c @@ -0,0 +1,17 @@ +#include +#include + + +int main() +{ + int output=0; + int error_code =0 ; + output=rename( "/home/timothy/test/cat/","/home/timothy/test/dog/"); + printf("output %d\n",output); + if (output <0 ) { + error_code = errno; + printf("error code %d\n",error_code); + printf("Error description is : %s\n",strerror(errno)); + } + return 0; +} diff --git a/direct/timothy_tests/linux_tests/rename.h b/direct/timothy_tests/linux_tests/rename.h new file mode 100644 index 0000000..e69de29 diff --git a/direct/timothy_tests/mirror_tests/README.txt b/direct/timothy_tests/mirror_tests/README.txt new file mode 100644 index 0000000..1edc620 --- /dev/null +++ b/direct/timothy_tests/mirror_tests/README.txt @@ -0,0 +1,24 @@ +Made by Timothy Manning on 24/12/10 + + + mirror_tests is designed to check that yaffs behaves the same way as linux. + This is done by applying the same command to both linux and yaffs and + then checking the output of the functions. + The default place for creating linux files is direct/timothy_tests/mirror_tests/tests/ + This directory is removed and is recreated at the beginning of each test, + However some of the files may be read only and cannot be deleted. + It is much better to remove this directory via the command line. + + rm test/*;rmdir test/;./mirror_tests -n 100 -v + +Command line arguments + -yaffs_path [PATH] //sets the path for yaffs. + -linux_path [PATH] //sets the path for linux. + -p [NUMBER] //sets the print level for mirror_tests. + -v //verbose mode everything is printed + -q //quiet mode nothing is printed. + -n [number] //sets the number of random tests to run. + -s [number] //seeds rand with the number + -t [number] //sets yaffs_trace to the number + -clean //removes emfile and test dir + diff --git a/direct/timothy_tests/mirror_tests/mirror_tests.c b/direct/timothy_tests/mirror_tests/mirror_tests.c index 8c7574e..aa9cd5b 100644 --- a/direct/timothy_tests/mirror_tests/mirror_tests.c +++ b/direct/timothy_tests/mirror_tests/mirror_tests.c @@ -48,11 +48,26 @@ test_temp linux_tests={ } }; +const struct option long_options[]={ + {"help", 0,NULL,'h'}, + {"yaffs_path", 1,NULL,'y'}, + {"linux_path", 1,NULL,'l'}, + {"print_level", 1,NULL,'p'}, + {"quiet", 0,NULL,'q'}, + {"number", 1,NULL,'n'}, + {"seed", 1,NULL,'s'}, + {"trace", 1,NULL,'t'}, + {"clean", 0,NULL,'c'}, + {"verbose", 0,NULL,'v'} +}; + +const char short_options[]="hy:l:p:qn:s:t:cv"; + int main(int argc, char *argv[]) { char message[100]; - int x; + // yaffs_tests.num_of_tests=(sizeof(yaffs_tests)/sizeof(test_temp)); // linux_tests.num_of_tests=(sizeof(linux_tests)/sizeof(test_temp)); @@ -79,6 +94,7 @@ void init(int argc, char *argv[]) dir[0]='\0'; int x=-1; char message[100]; + int new_option; x=(unsigned)time(NULL); sprintf(message,"seeding srand with: %d\n",x); @@ -98,8 +114,9 @@ void init(int argc, char *argv[]) strcpy(yaffs_struct.root_path,"yaffs2/test/"); - for (x=0;xd_name); - sprintf(message,"unlinking file %d\n",linux_current_file->d_name); + sprintf(message,"unlinking file %s\n",file); print_message(3,message); - unlink(file); + print_message(3,"chmoding file\n"); + output=chmod(file,(S_IRUSR|S_IWUSR)); + if (output<0) { + get_error_linux(); + } + print_message(3,"unlinking file\n"); + output=unlink(file); + if (output<0) { + get_error_linux(); + } } - } + } while(linux_current_file); closedir(linux_open_dir); rmdir(linux_struct.root_path); } diff --git a/direct/timothy_tests/mirror_tests/mirror_tests.h b/direct/timothy_tests/mirror_tests/mirror_tests.h index cf4bb8e..31b6c14 100644 --- a/direct/timothy_tests/mirror_tests/mirror_tests.h +++ b/direct/timothy_tests/mirror_tests/mirror_tests.h @@ -24,6 +24,7 @@ #include "yaffsfs.h" #include "lib.h" #include +#include #include #include "linux_test_open.h" diff --git a/direct/timothy_tests/quick_tests/quick_tests.c b/direct/timothy_tests/quick_tests/quick_tests.c index 0e34ea7..b2864a0 100644 --- a/direct/timothy_tests/quick_tests/quick_tests.c +++ b/direct/timothy_tests/quick_tests/quick_tests.c @@ -25,6 +25,20 @@ static unsigned int num_of_tests_pass=0; static unsigned int num_of_tests_failed=0; static unsigned int total_number_of_tests=(sizeof(test_list)/sizeof(test_template)); + +const struct option long_options[]={ + {"help", 0,NULL,'h'}, + {"quiet", 0,NULL,'q'}, + {"number", 1,NULL,'n'}, + {"trace", 1,NULL,'t'}, + {"continue", 0,NULL,'c'}, + {"verbose", 0,NULL,'v'} +}; + +const char short_options[]="hqn:t:cv"; + + + int main(int argc, char *argv[]) { int x=0; @@ -137,30 +151,32 @@ void get_error(void) void init_quick_tests(int argc, char *argv[]) { int trace=0; + int new_option; int x=0; - for (x = 0; x < argc; x++){ - if (0==strcmp(argv[x],"-h")){ + do{ + new_option=getopt_long(argc,argv,short_options,long_options,NULL); + if (new_option=='h'){ printf("help\n"); printf("-h will print the commands available\n"); - printf("-c will continue after a test failes else the program will exit\n"); + printf("-c will continue after a test fails else the program will exit\n"); printf("-v will print all messages\n"); printf("-q quiet mode only the number of tests passed and failed will be printed\n"); printf("-t [number] set yaffs_trace to number\n"); - printf("-r [number] sets the number of random loops to run after the the test has run\n"); + printf("-n [number] sets the number of random loops to run after the the test has run\n"); exit(0); - } else if (0==strcmp(argv[x],"-c")) { + } else if (new_option=='c') { set_exit_on_error(0); - } else if (0==strcmp(argv[x],"-q")) { + } else if (new_option=='q') { set_print_level(-3); - } else if (0==strcmp(argv[x],"-t")) { - trace = atoi(argv[x+1]); - } else if (0==strcmp(argv[x],"-v")) { + } else if (new_option=='t') { + trace = atoi(optarg); + } else if (new_option=='v') { set_print_level(5); - } else if (0==strcmp(argv[x],"-r")) { - number_of_random_tests=atoi(argv[x+1]); + } else if (new_option=='n') { + number_of_random_tests=atoi(optarg); } - } + }while (new_option!=-1); yaffs_start_up(); yaffs_set_trace(trace); diff --git a/direct/timothy_tests/quick_tests/quick_tests.h b/direct/timothy_tests/quick_tests/quick_tests.h index 50d17dc..725ead2 100644 --- a/direct/timothy_tests/quick_tests/quick_tests.h +++ b/direct/timothy_tests/quick_tests/quick_tests.h @@ -16,6 +16,7 @@ #ifndef __quick_tests_h__ #define __quick_tests_h__ #include +#include #include "test_yaffs_mount.h" #include "test_yaffs_mount_ENODEV.h" diff --git a/direct/timothy_tests/threading/Makefile b/direct/timothy_tests/threading/Makefile new file mode 100644 index 0000000..8006b79 --- /dev/null +++ b/direct/timothy_tests/threading/Makefile @@ -0,0 +1,115 @@ +# 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 +# +# 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_tagsvalidity.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_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_tagsvalidity.c yaffs_tagsvalidity.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 + +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/threading/lib.c b/direct/timothy_tests/threading/lib.c new file mode 100644 index 0000000..6456958 --- /dev/null +++ b/direct/timothy_tests/threading/lib.c @@ -0,0 +1,42 @@ +/* + * YAFFS: Yet another FFS. A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Timothy Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "lib.h" +static unsigned int *p_counter; +static unsigned int numberOfThreads=5; + +unsigned int get_num_of_threads(void) +{ + return numberOfThreads; +} + +void number_of_threads(unsigned int num) +{ + numberOfThreads=num; +} + +int get_counter(int x) +{ + return p_counter[x]; +} + +void set_counter(int x, unsigned int value) +{ + p_counter[x]=value; +} + +void init_counter(unsigned int size_of_counter) +{ + p_counter=malloc(size_of_counter*sizeof(int)); +} + diff --git a/direct/timothy_tests/threading/lib.h b/direct/timothy_tests/threading/lib.h new file mode 100644 index 0000000..f635294 --- /dev/null +++ b/direct/timothy_tests/threading/lib.h @@ -0,0 +1,38 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Timothy Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 as + * published by the Free Software Foundation. + * + * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. + */ + +#ifndef __lib_h__ +#define __lib_h__ + +#define BOVVER_HANDLES 10 +#include "yaffsfs.h" +struct bovver_context { + int bovverType; + int threadId; + char baseDir[200]; + int h[BOVVER_HANDLES]; + yaffs_DIR *dirH; + int opMax; + int op; + int cycle; +}; + +int get_counter(int x); +void set_counter(int x, unsigned int value); +void init_counter(unsigned int size_of_counter); +void number_of_threads(unsigned int num); +unsigned int get_num_of_threads(void); + +#endif diff --git a/direct/timothy_tests/threading/test_a.c b/direct/timothy_tests/threading/test_a.c new file mode 100644 index 0000000..391530c --- /dev/null +++ b/direct/timothy_tests/threading/test_a.c @@ -0,0 +1,99 @@ +/* + * YAFFS: Yet another FFS. A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Timothy Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "test_a.h" + + + + + +void test_a(void *x) +{ + struct bovver_context *bc = (struct bovver_context *)x; + + int i; + int op; + int pos; + int n; + int n1; + + char name[200]; + char name1[200]; + + int start_op; + + + i = rand() % BOVVER_HANDLES; + op = rand() % bc->opMax; + pos = rand() & 20000000; + n = rand() % 100; + n1 = rand() % 100; + + start_op = op; + + sprintf(name, "%s/xx%d",bc->baseDir,n); + sprintf(name1,"%s/xx%d",bc->baseDir,n1); + + bc->op = op; + bc->cycle++; + + op-=1; + if(op < 0){ + if(bc->h[i]>= 0){ + yaffs_close(bc->h[i]); + bc->h[i] = -1; + } + return; + } + + op-=1; + if(op < 0){ + if(bc->h[i] < 0) + bc->h[i] = yaffs_open(name,O_CREAT| O_RDWR, 0666); + return; + } + + op-=5; + if(op< 0){ + yaffs_lseek(bc->h[i],pos,SEEK_SET); + yaffs_write(bc->h[i],name,n); + return; + } + + op-=1; + if(op < 0){ + yaffs_unlink(name); + return; + } + op-=1; + if(op < 0){ + yaffs_rename(name,name1); + return; + } + op-=1; + if(op < 0){ + yaffs_mkdir(name,0666); + return; + } + op-=1; + if(op < 0){ + yaffs_rmdir(name); + return; + } + + bc->opMax = (start_op - op -1); + + return; + +} + diff --git a/direct/timothy_tests/threading/test_a.h b/direct/timothy_tests/threading/test_a.h new file mode 100644 index 0000000..87cb3df --- /dev/null +++ b/direct/timothy_tests/threading/test_a.h @@ -0,0 +1,22 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Timothy Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 as + * published by the Free Software Foundation. + * + * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. + */ + +#ifndef __test_a_h__ +#define __test_a_h__ + +#include "yaffsfs.h" +#include "lib.h" +void test_a(void *x); +#endif diff --git a/direct/timothy_tests/threading/test_b.c b/direct/timothy_tests/threading/test_b.c new file mode 100644 index 0000000..0476113 --- /dev/null +++ b/direct/timothy_tests/threading/test_b.c @@ -0,0 +1,39 @@ +/* + * YAFFS: Yet another FFS. A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Timothy Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "test_b.h" + +void test_b(void *x) +{ + struct bovver_context *bc = (struct bovver_context *)x; + int n = rand() % 20; + + bc->cycle++; + + if(!bc->dirH) + bc->dirH = yaffs_opendir(bc->baseDir); + + if(!bc->dirH) + return; + + if(n == 0){ + yaffs_closedir(bc->dirH); + bc->dirH = NULL; + } else { + while(n > 1){ + n--; + yaffs_readdir(bc->dirH); + } + } +} + diff --git a/direct/timothy_tests/threading/test_b.h b/direct/timothy_tests/threading/test_b.h new file mode 100644 index 0000000..c242a93 --- /dev/null +++ b/direct/timothy_tests/threading/test_b.h @@ -0,0 +1,21 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Timothy Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 as + * published by the Free Software Foundation. + * + * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. + */ + +#ifndef __test_b_h__ +#define __test_b_h__ +#include "yaffsfs.h" +#include "lib.h" +void test_b(void *x); +#endif diff --git a/direct/timothy_tests/threading/thread_function.c b/direct/timothy_tests/threading/thread_function.c new file mode 100644 index 0000000..52b78d0 --- /dev/null +++ b/direct/timothy_tests/threading/thread_function.c @@ -0,0 +1,70 @@ +/* + * YAFFS: Yet another FFS. A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Timothy Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "thread_function.h" + + + +int number_of_tests=2; + + +void * init(int threadId, const char *baseDir, int bovver_type) +{ + struct bovver_context *bc = malloc(sizeof(struct bovver_context)); + + if(bc){ + memset(bc,0,sizeof(*bc)); + bc->threadId = threadId; + strncpy(bc->baseDir,baseDir,200); + bc->bovverType = bovver_type; + bc->opMax = 99; + printf("bovver_init %d \"%s\"\n",threadId,baseDir); + } + return (void *)bc; +} + + +typedef struct test { + void (*p_function)(void *); /*pointer to test function*/ + /*char pass_message[50]; will not need a pass message*/ + char *name_of_test; /*pointer to fail message, needs to include name of test*/ +}test_template; + + +test_template test_list[]={ + //{dummy_test,dummy_test_clean,"dummy_test"}, + {test_a, "test_a"}, + {test_b, "test_b"} +}; + +int thread_function(void *thread_id_ptr) +{ + int thread_id = (int) thread_id_ptr; + int test_id=0; + unsigned int y=0; + printf("Starting thread %d, id %d\n", pthread_self(),thread_id); + void *x=init(thread_id,"/yaffs2/",0); + while(1){ + y++; + //set_counter(thread_id,y); + test_id=(rand()%(number_of_tests-1)); + test_list[test_id].p_function(x); + //printf("thread: %d. ran test: %d\n",thread_id,y); + //printf("counter before %d\n",get_counter(thread_id)); + set_counter(thread_id,y); + //printf("counter after setting %d\n",get_counter(thread_id)); + } + //select random file name from a list. + //run a random function on the file. + return 1; +} diff --git a/direct/timothy_tests/threading/thread_function.h b/direct/timothy_tests/threading/thread_function.h new file mode 100644 index 0000000..106793f --- /dev/null +++ b/direct/timothy_tests/threading/thread_function.h @@ -0,0 +1,28 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Timothy Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 as + * published by the Free Software Foundation. + * + * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. + */ + +#ifndef __thread_function_h__ +#define __thread_function_h__ + + +#include +#include + +#include "test_a.h" +#include "test_b.h" +#include "lib.h" +int thread_function(void * thread_id); +void * init(int threadId, const char *baseDir, int bovver_type); +#endif diff --git a/direct/timothy_tests/threading/threading.c b/direct/timothy_tests/threading/threading.c new file mode 100644 index 0000000..4b65e38 --- /dev/null +++ b/direct/timothy_tests/threading/threading.c @@ -0,0 +1,80 @@ +/* + * YAFFS: Yet another FFS. A NAND-flash specific file system. + * + * Copyright (C) 2002-2010 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Timothy Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "threading.h" + +int random_seed; +int simulate_power_failure = 0; + +const struct option long_options[]={ + {"help", 0,NULL,'h'}, + {"threads", 1,NULL,'t'} +}; + +const char short_options[]="ht:"; + + + + +void main_init(int argc, char *argv[]) +{ + int new_option; + int x=0; + int new_num_of_threads=5; + x=(unsigned)time(NULL); + printf("seeding srand with: %d\n",x); + srand(x); + do{ + new_option=getopt_long(argc,argv,short_options,long_options,NULL); + if (new_option=='h'){ + printf("help\n"); + printf("-h will print the commands available\n"); + printf("-t [number] sets the number of threads\n"); + exit(0); + } else if (new_option=='t') { + new_num_of_threads=atoi(optarg); + } + }while (new_option!=-1); + number_of_threads(new_num_of_threads); + init_counter(new_num_of_threads); + +} + +int main(int argc, char *argv[]) +{ + main_init(argc,argv); + pthread_t threads[get_num_of_threads()]; + unsigned int x=0; + int output=0; + int y=0; + + for (x=0;x0){ + printf("failed to create thread %d. Error is %d\n",x,output); + } + + } + while (1){ + y=0; + printf("thread counter: %d ",get_counter(y)); + for (y=1;y + * + * 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 __threading_h__ +#define __threading_h__ +#include +#include +#include +#include "thread_function.h" +#include "lib.h" +#include +#endif diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index e3bc19d..e4f6df0 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -650,13 +650,11 @@ static struct yaffs_obj *yaffsfs_DoFindDirectory(struct yaffs_obj *startDir, /* got to the end of the string */ return dir; else{ - if(strcmp(str,_Y(".")) == 0) - { + if(strcmp(str,_Y(".")) == 0){ /* Do nothing */ - } - else if(strcmp(str,_Y("..")) == 0) + } else if(strcmp(str,_Y("..")) == 0) { dir = dir->parent; - else{ + } else{ dir = yaffs_find_by_name(dir,str); dir = yaffsfs_FollowLink(dir,symDepth,loop); diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h index 3c6ddf5..ad4efab 100644 --- a/direct/ydirectenv.h +++ b/direct/ydirectenv.h @@ -61,7 +61,7 @@ void yaffs_qsort(void *aa, size_t n, size_t es, #define cond_resched() do {} while(0) #define yaffs_trace(msk, fmt, ...) do { \ - if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \ + if(yaffs_trace_mask & (msk)) \ printf("yaffs: " fmt "\n", ##__VA_ARGS__); \ } while(0) diff --git a/yaffs_guts.c b/yaffs_guts.c index f4ae9de..486b7e0 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -1532,7 +1532,7 @@ static struct yaffs_cache *yaffs_grab_chunk_cache(struct yaffs_dev *dev) /* With locking we can't assume we can use entry zero */ - the_obj = NULL; + the_obj = dev->cache[0].object; usage = -1; cache = NULL; pushout = -1; @@ -1952,16 +1952,12 @@ struct yaffs_obj *yaffs_find_by_number(struct yaffs_dev *dev, u32 number) list_for_each(i, &dev->obj_bucket[bucket].list) { /* Look if it is in the list */ - if (i) { - in = list_entry(i, struct yaffs_obj, hash_link); - if (in->obj_id == number) { - - /* Don't tell the VFS about this one if it is defered free */ - if (in->defered_free) - return NULL; - - return in; - } + in = list_entry(i, struct yaffs_obj, hash_link); + if (in->obj_id == number) { + /* Don't tell the VFS about this one if it is defered free */ + if (in->defered_free) + return NULL; + return in; } } @@ -4082,11 +4078,13 @@ static int yaffs_unlink_worker(struct yaffs_obj *obj) int del_now = 0; + if(!obj) + return YAFFS_FAIL; + if (!obj->my_inode) del_now = 1; - if (obj) - yaffs_update_parent(obj->parent); + yaffs_update_parent(obj->parent); if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) { return yaffs_del_link(obj); @@ -4496,29 +4494,26 @@ struct yaffs_obj *yaffs_find_by_name(struct yaffs_obj *directory, sum = yaffs_calc_name_sum(name); list_for_each(i, &directory->variant.dir_variant.children) { - if (i) { - l = list_entry(i, struct yaffs_obj, siblings); + l = list_entry(i, struct yaffs_obj, siblings); - if (l->parent != directory) - YBUG(); + if (l->parent != directory) + YBUG(); - yaffs_check_obj_details_loaded(l); + yaffs_check_obj_details_loaded(l); - /* Special case for lost-n-found */ - if (l->obj_id == YAFFS_OBJECTID_LOSTNFOUND) { - if (!strcmp(name, YAFFS_LOSTNFOUND_NAME)) - return l; - } else if (l->sum == sum - || l->hdr_chunk <= 0) { - /* LostnFound chunk called Objxxx - * Do a real check - */ - yaffs_get_obj_name(l, buffer, - YAFFS_MAX_NAME_LENGTH + 1); - if (strncmp - (name, buffer, YAFFS_MAX_NAME_LENGTH) == 0) - return l; - } + /* Special case for lost-n-found */ + if (l->obj_id == YAFFS_OBJECTID_LOSTNFOUND) { + if (!strcmp(name, YAFFS_LOSTNFOUND_NAME)) + return l; + } else if (l->sum == sum + || l->hdr_chunk <= 0) { + /* LostnFound chunk called Objxxx + * Do a real check + */ + yaffs_get_obj_name(l, buffer, + YAFFS_MAX_NAME_LENGTH + 1); + if (strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0) + return l; } } diff --git a/yaffs_mtdif1_multi.c b/yaffs_mtdif1_multi.c index 603dc97..cf9c54c 100644 --- a/yaffs_mtdif1_multi.c +++ b/yaffs_mtdif1_multi.c @@ -238,7 +238,7 @@ int nandmtd1_read_chunk_tags(struct yaffs_dev *dev, deleted = !pt1.deleted; pt1.deleted = 1; #else - deleted = (yaffs_count_bits(((u8 *) & pt1)[8]) < 7); + deleted = (hweight8(((u8 *) & pt1)[8]) < 7); #endif /* Check the packed tags mini-ECC and correct if necessary/possible. diff --git a/yaffs_mtdif1_single.c b/yaffs_mtdif1_single.c index 5108369..740f7f6 100644 --- a/yaffs_mtdif1_single.c +++ b/yaffs_mtdif1_single.c @@ -207,7 +207,7 @@ int nandmtd1_read_chunk_tags(struct yaffs_dev *dev, deleted = !pt1.deleted; pt1.deleted = 1; #else - deleted = (yaffs_count_bits(((u8 *) & pt1)[8]) < 7); + deleted = (hweight8(((u8 *) & pt1)[8]) < 7); #endif /* Check the packed tags mini-ECC and correct if necessary/possible. diff --git a/yaffs_nand.c b/yaffs_nand.c index e816cab..25b5213 100644 --- a/yaffs_nand.c +++ b/yaffs_nand.c @@ -72,6 +72,7 @@ int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev, } else { yaffs_trace(YAFFS_TRACE_ERROR, "Writing with no tags"); YBUG(); + return YAFFS_FAIL; } if (dev->param.write_chunk_tags_fn) diff --git a/yaffs_tagscompat.c b/yaffs_tagscompat.c index 7578075..818f72b 100644 --- a/yaffs_tagscompat.c +++ b/yaffs_tagscompat.c @@ -151,7 +151,7 @@ static int yaffs_rd_chunk_nand(struct yaffs_dev *dev, int ret_val; struct yaffs_spare local_spare; - if (!spare && data) { + if (!spare) { /* If we don't have a real spare, then we use a local one. */ /* Need this for the calculation of the ecc */ spare = &local_spare; @@ -290,7 +290,7 @@ int yaffs_tags_compat_wr(struct yaffs_dev *dev, struct yaffs_tags tags; yaffs_spare_init(&spare); - + if (ext_tags->is_deleted) spare.page_status = 0; else { diff --git a/yaffs_verify.c b/yaffs_verify.c index 738c7f6..55884b9 100644 --- a/yaffs_verify.c +++ b/yaffs_verify.c @@ -163,8 +163,8 @@ void yaffs_verify_blocks(struct yaffs_dev *dev) } /* - * Verify the object header. oh must be valid, but obj and tags may be NULL in which - * case those tests will not be performed. + * Verify the object header. oh must be valid, but obj and tags may be NULL in + * which case those tests will not be performed. */ void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh, struct yaffs_ext_tags *tags, int parent_check) @@ -414,11 +414,8 @@ void yaffs_verify_objects(struct yaffs_dev *dev) for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) { list_for_each(lh, &dev->obj_bucket[i].list) { - if (lh) { - obj = - list_entry(lh, struct yaffs_obj, hash_link); - yaffs_verify_obj(obj); - } + obj = list_entry(lh, struct yaffs_obj, hash_link); + yaffs_verify_obj(obj); } } } @@ -453,12 +450,10 @@ void yaffs_verify_obj_in_dir(struct yaffs_obj *obj) /* Iterate through the objects in each hash entry */ list_for_each(lh, &obj->parent->variant.dir_variant.children) { - if (lh) { - list_obj = list_entry(lh, struct yaffs_obj, siblings); - yaffs_verify_obj(list_obj); - if (obj == list_obj) - count++; - } + list_obj = list_entry(lh, struct yaffs_obj, siblings); + yaffs_verify_obj(list_obj); + if (obj == list_obj) + count++; } if (count != 1) { @@ -492,16 +487,14 @@ void yaffs_verify_dir(struct yaffs_obj *directory) /* Iterate through the objects in each hash entry */ list_for_each(lh, &directory->variant.dir_variant.children) { - if (lh) { - list_obj = list_entry(lh, struct yaffs_obj, siblings); - if (list_obj->parent != directory) { - yaffs_trace(YAFFS_TRACE_ALWAYS, - "Object in directory list has wrong parent %p", - list_obj->parent); - YBUG(); - } - yaffs_verify_obj_in_dir(list_obj); + list_obj = list_entry(lh, struct yaffs_obj, siblings); + if (list_obj->parent != directory) { + yaffs_trace(YAFFS_TRACE_ALWAYS, + "Object in directory list has wrong parent %p", + list_obj->parent); + YBUG(); } + yaffs_verify_obj_in_dir(list_obj); } } diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c index 85df2d7..78e2f9f 100644 --- a/yaffs_vfs_multi.c +++ b/yaffs_vfs_multi.c @@ -692,11 +692,9 @@ static void yaffs_remove_obj_callback(struct yaffs_obj *obj) * the search context to the next object to prevent a hanging pointer. */ list_for_each(i, search_contexts) { - if (i) { - sc = list_entry(i, struct yaffs_search_context, others); - if (sc->next_return == obj) - yaffs_search_advance(sc); - } + sc = list_entry(i, struct yaffs_search_context, others); + if (sc->next_return == obj) + yaffs_search_advance(sc); } } @@ -866,7 +864,7 @@ static void yaffs_evict_inode(struct inode *inode) 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")); + obj ? "object exists" : "null object"); if (!inode->i_nlink && !is_bad_inode(inode)) deleteme = 1; @@ -1421,6 +1419,12 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, 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); @@ -1432,13 +1436,9 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, else ipos = *pos; - if (!obj) - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_file_write: hey obj is null!"); - else - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_file_write about to write writing %u(%x) bytes to object %d at %d(%x)", - (unsigned)n, (unsigned)n, obj->obj_id, ipos, ipos); + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_file_write about to write writing %u(%x) bytes to object %d at %d(%x)", + (unsigned)n, (unsigned)n, obj->obj_id, ipos, ipos); n_written = yaffs_wr_file(obj, buf, ipos, n, 0); @@ -2623,6 +2623,11 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, struct yaffs_linux_context *context_iterator; struct list_head *l; + if (!sb) { + printk(KERN_INFO "yaffs: sb is NULL\n"); + return NULL; + } + sb->s_magic = YAFFS_MAGIC; sb->s_op = &yaffs_super_ops; sb->s_flags |= MS_NOATIME; @@ -2633,9 +2638,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, sb->s_export_op = &yaffs_export_ops; #endif - if (!sb) - printk(KERN_INFO "yaffs: sb is NULL\n"); - else if (!sb->s_dev) + if (!sb->s_dev) printk(KERN_INFO "yaffs: sb->s_dev is NULL\n"); else if (!yaffs_devname(sb, devname_buf)) printk(KERN_INFO "yaffs: devname is NULL\n"); diff --git a/yaffs_vfs_single.c b/yaffs_vfs_single.c index d5b8753..1893125 100644 --- a/yaffs_vfs_single.c +++ b/yaffs_vfs_single.c @@ -59,9 +59,6 @@ #include -#define UnlockPage(p) unlock_page(p) -#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags) - #define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) #define YPROC_ROOT NULL @@ -786,11 +783,9 @@ static void yaffs_remove_obj_callback(struct yaffs_obj *obj) * the search context to the next object to prevent a hanging pointer. */ list_for_each(i, search_contexts) { - if (i) { - sc = list_entry(i, struct yaffs_search_context, others); - if (sc->next_return == obj) - yaffs_search_advance(sc); - } + sc = list_entry(i, struct yaffs_search_context, others); + if (sc->next_return == obj) + yaffs_search_advance(sc); } } @@ -1177,7 +1172,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) static int yaffs_readpage_unlock(struct file *f, struct page *pg) { int ret = yaffs_readpage_nolock(f, pg); - UnlockPage(pg); + unlock_page(pg); return ret; } @@ -1334,7 +1329,7 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping, } yaffs_trace(YAFFS_TRACE_OS, "start yaffs_write_begin index %d(%x) uptodate %d", - (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0); + (int)index, (int)index, PageUptodate(pg) ? 1 : 0); /* Get fs space */ space_held = yaffs_hold_space(filp); @@ -1346,7 +1341,7 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping, /* Update page if required */ - if (!Page_Uptodate(pg)) + if (!PageUptodate(pg)) ret = yaffs_readpage_nolock(filp, pg); if (ret) @@ -1379,6 +1374,13 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, obj = yaffs_dentry_to_obj(f->f_dentry); + if (!obj) { + /* This should not happen */ + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_file_write: hey obj is null!"); + return -ENINVAL; + } + dev = obj->my_dev; yaffs_gross_lock(dev); @@ -1390,13 +1392,9 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, else ipos = *pos; - if (!obj) - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_file_write: hey obj is null!"); - else - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_file_write about to write writing %u(%x) bytes to object %d at %d(%x)", - (unsigned)n, (unsigned)n, obj->obj_id, ipos, ipos); + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_file_write about to write writing %u(%x) bytes to object %d at %d(%x)", + (unsigned)n, (unsigned)n, obj->obj_id, ipos, ipos); n_written = yaffs_wr_file(obj, buf, ipos, n, 0); @@ -2030,6 +2028,11 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, struct yaffs_linux_context *context_iterator; struct list_head *l; + if (!sb) { + printk(KERN_INFO "yaffs: sb is NULL\n"); + return NULL; + } + sb->s_magic = YAFFS_MAGIC; sb->s_op = &yaffs_super_ops; sb->s_flags |= MS_NOATIME; @@ -2038,9 +2041,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, sb->s_export_op = &yaffs_export_ops; - if (!sb) - printk(KERN_INFO "yaffs: sb is NULL\n"); - else if (!sb->s_dev) + if (!sb->s_dev) printk(KERN_INFO "yaffs: sb->s_dev is NULL\n"); else if (!yaffs_devname(sb, devname_buf)) printk(KERN_INFO "yaffs: devname is NULL\n"); diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c index 9eb6030..c879f57 100644 --- a/yaffs_yaffs1.c +++ b/yaffs_yaffs1.c @@ -110,7 +110,6 @@ int yaffs1_scan(struct yaffs_dev *dev) */ deleted++; dev->n_free_chunks++; - /*T((" %d %d deleted\n",blk,c)); */ } else if (!tags.chunk_used) { /* An unassigned chunk in the block * This means that either the block is empty or @@ -178,7 +177,6 @@ int yaffs1_scan(struct yaffs_dev *dev) } } - /* T((" %d %d data %d %d\n",blk,c,tags.obj_id,tags.chunk_id)); */ } else { /* chunk_id == 0, so it is an ObjectHeader. * Thus, we read in the object header and make the object diff --git a/yaffs_yaffs2.c b/yaffs_yaffs2.c index 33397af..339f47f 100644 --- a/yaffs_yaffs2.c +++ b/yaffs_yaffs2.c @@ -568,28 +568,23 @@ static int yaffs2_wr_checkpt_objs(struct yaffs_dev *dev) for (i = 0; ok && i < YAFFS_NOBJECT_BUCKETS; i++) { list_for_each(lh, &dev->obj_bucket[i].list) { - if (lh) { - obj = - list_entry(lh, struct yaffs_obj, hash_link); - if (!obj->defered_free) { - yaffs2_obj_checkpt_obj(&cp, obj); - cp.struct_type = sizeof(cp); - - yaffs_trace(YAFFS_TRACE_CHECKPOINT, - "Checkpoint write object %d parent %d type %d chunk %d obj addr %p", - cp.obj_id, cp.parent_id, - cp.variant_type, cp.hdr_chunk, obj); - - ok = (yaffs2_checkpt_wr - (dev, &cp, + obj = list_entry(lh, struct yaffs_obj, hash_link); + if (!obj->defered_free) { + yaffs2_obj_checkpt_obj(&cp, obj); + cp.struct_type = sizeof(cp); + + yaffs_trace(YAFFS_TRACE_CHECKPOINT, + "Checkpoint write object %d parent %d type %d chunk %d obj addr %p", + cp.obj_id, cp.parent_id, + cp.variant_type, cp.hdr_chunk, obj); + + ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)); - if (ok - && obj->variant_type == - YAFFS_OBJECT_TYPE_FILE) - ok = yaffs2_wr_checkpt_tnodes - (obj); - } + if (ok && + obj->variant_type == + YAFFS_OBJECT_TYPE_FILE) + ok = yaffs2_wr_checkpt_tnodes(obj); } } } diff --git a/yportenv_multi.h b/yportenv_multi.h index 4dddf63..10e284e 100644 --- a/yportenv_multi.h +++ b/yportenv_multi.h @@ -24,7 +24,9 @@ #define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c)) +#ifdef YAFFS_OUT_OF_TREE #include "moduleconfig.h" +#endif #include #define MTD_VERSION_CODE LINUX_VERSION_CODE @@ -75,7 +77,7 @@ #endif #define yaffs_trace(msk, fmt, ...) do { \ - if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \ + if(yaffs_trace_mask & (msk)) \ printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \ } while(0) diff --git a/yportenv_single.h b/yportenv_single.h index 236f579..8183425 100644 --- a/yportenv_single.h +++ b/yportenv_single.h @@ -54,7 +54,7 @@ #endif #define yaffs_trace(msk, fmt, ...) do { \ - if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \ + if(yaffs_trace_mask & (msk)) \ printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \ } while(0)