yaffs Some cleanups.

Update copyright messages.
Clean up tracing to use TSTR and KERN_DEBUG.
Remove cvs $Id.
Change /proc/yaffs_debug to /proc/yaffs_stats.
... and a few other clean ups.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/Makefile b/Makefile
index d92630b623fd0c7355394976d619950b078a536d..f297efa878c065e6dad5d248d59c9935691b3b25 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 # YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
 #
 #
 # YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
 #

-# Copyright (C) 2002-2007 Aleph One Ltd.
+# Copyright (C) 2002-2010 Aleph One Ltd.

 #   for Toby Churchill Ltd and Brightstar Engineering
 #
 # Created by Charles Manning <charles@aleph1.co.uk>
 #   for Toby Churchill Ltd and Brightstar Engineering
 #
 # Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/devextras.h b/devextras.h
index 7df46dc2921cb8c686ad253360ce18b4967a1f18..215caa50f1782e6a8543998c982d4001a2cb52e0 100644 (file)
--- a/devextras.h
+++ b/devextras.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/Makefile b/direct/Makefile
index ac9aaff931e1ca5b7937bcd625d24d0b93a57b97..beec566b925fcef9d5436f9f2abad0daa2c41b86 100644 (file)
--- a/direct/Makefile
+++ b/direct/Makefile
@@ -3,7 +3,7 @@
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
 #
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
 #

-# Copyright (C) 2003 Aleph One Ltd.
+# Copyright (C) 2003-2010 Aleph One Ltd.

 #
 #
 # Created by Charles Manning <charles@aleph1.co.uk>
 #
 #
 # Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/dtest.c b/direct/dtest.c
index b2dcc0f27387c1615e84583a0eebb1c0bc6f1b4b..a93e1d05071a135a036591468720730368b7442e 100644 (file)
--- a/direct/dtest.c
+++ b/direct/dtest.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another FFS. A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another FFS. A NAND-flash specific file system. 
  *

- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/python/Makefile b/direct/python/Makefile
index efabc61fa8a8e003e80bf929f75e011ddfc1031e..4117d5485be5fe702d0e054aa5b645eff8d9656b 100644 (file)
--- a/direct/python/Makefile
+++ b/direct/python/Makefile
@@ -3,7 +3,7 @@
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
 #
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
 #

-# Copyright (C) 2003 Aleph One Ltd.
+# Copyright (C) 2003-2010 Aleph One Ltd.

 #
 #
 # Created by Charles Manning <charles@aleph1.co.uk>
 #
 #
 # Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/python/yaffs_python_helper.c b/direct/python/yaffs_python_helper.c
index 0a523e63c52bf8a9f2bf898c4766471a11a44011..425bcda1e83bfc1ab990839699361a4d367c4a59 100644 (file)
--- a/direct/python/yaffs_python_helper.c
+++ b/direct/python/yaffs_python_helper.c
@@ -2,7 +2,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/tests/Makefile b/direct/tests/Makefile
index 86e0d8d9e127f44a7c81c8f9910f8c7360594066..a2d201a7414cfa01f8ed85e82a438a0193857a61 100644 (file)
--- a/direct/tests/Makefile
+++ b/direct/tests/Makefile
@@ -3,7 +3,7 @@
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
 #
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
 #

-# Copyright (C) 2003 Aleph One Ltd.
+# Copyright (C) 2003-2010 Aleph One Ltd.

 #
 #
 # Created by Charles Manning <charles@aleph1.co.uk>
 #
 #
 # Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/tests/fuzzer.c b/direct/tests/fuzzer.c
index fed272a89fcc9bcc8143bf1b68792ba61fc93049..deadf951b12a7c60d018bbe55dde02eee37cdccb 100644 (file)
--- a/direct/tests/fuzzer.c
+++ b/direct/tests/fuzzer.c
@@ -1,4 +1,15 @@
 /*
 /*

+ * 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 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.
+ *

  * Fuzzer to fuzz a file
  */
 
  * Fuzzer to fuzz a file
  */
 

diff --git a/direct/tests/nor_stress.c b/direct/tests/nor_stress.c
index 28fbb2d6015fca8e00f188c82d3692b19e753878..349ecbe5adcfd3abe1eff201315293fe26290ea7 100644 (file)
--- a/direct/tests/nor_stress.c
+++ b/direct/tests/nor_stress.c
@@ -1,3 +1,17 @@
+/*
+ * 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 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.
+ *
+ */
+

 #include "nor_stress.h"
 
 
 #include "nor_stress.h"
 
 

diff --git a/direct/tests/nor_stress.h b/direct/tests/nor_stress.h
index c6531c18956505bf309ac48e6683350ea00c0344..7c4274ed3058f889fb19f952747dadaab128af40 100644 (file)
--- a/direct/tests/nor_stress.h
+++ b/direct/tests/nor_stress.h
@@ -1,3 +1,17 @@
+/*
+ * 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 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.
+ *
+ */
+

 #ifndef __NOR_STRESS_H__
 #define __NOR_STRESS_H__
 
 #ifndef __NOR_STRESS_H__
 #define __NOR_STRESS_H__
 

diff --git a/direct/tests/yaffs_test.c b/direct/tests/yaffs_test.c
index faf5bef0f73df94685b0388d0544c6c4ddd6151b..520626abe74e07ece3dd438f6240c3fe46c6bfce 100644 (file)
--- a/direct/tests/yaffs_test.c
+++ b/direct/tests/yaffs_test.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another FFS. A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another FFS. A NAND-flash specific file system. 
  *

- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_fileem.c b/direct/yaffs_fileem.c
index f78f7c5bfa4b92e0f5f3a10593252551af41e00c..90c8f9e3f65dfd1a751bddaaefbaa328fa867ae4 100644 (file)
--- a/direct/yaffs_fileem.c
+++ b/direct/yaffs_fileem.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_fileem2k.c b/direct/yaffs_fileem2k.c
index 4f58e981f6accae78ee2adf84934cf0ef1408627..84b7eb80469a0dd2e3e21c1a9ab0bb8395035e98 100644 (file)
--- a/direct/yaffs_fileem2k.c
+++ b/direct/yaffs_fileem2k.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_fileem2k.h b/direct/yaffs_fileem2k.h
index d750cc3f7c408fa460b331859471c00d2c352e2e..2b6f6e9be66a4a6c1847a2cd29385e47f4f13030 100644 (file)
--- a/direct/yaffs_fileem2k.h
+++ b/direct/yaffs_fileem2k.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_flashif.c b/direct/yaffs_flashif.c
index cea57e90d3d4f4f4b06803d91b748d40a3650238..0a46739421ae18674935a25010e4ffa05cdbcb06 100644 (file)
--- a/direct/yaffs_flashif.c
+++ b/direct/yaffs_flashif.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_flashif.h b/direct/yaffs_flashif.h
index a6bc65db119cb6a63799a0333a5cae784a5e6ae9..e8c2261bc0ef985089b49b07892dcfa45355a433 100644 (file)
--- a/direct/yaffs_flashif.h
+++ b/direct/yaffs_flashif.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_flashif2.h b/direct/yaffs_flashif2.h
index dfd0fe904cb5df67dfa6ec1a69c4dac1ca1713e5..3d4e1fd4e23a6a0d1b4cbb0cb8cc911f9a271e72 100644 (file)
--- a/direct/yaffs_flashif2.h
+++ b/direct/yaffs_flashif2.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_malloc.h b/direct/yaffs_malloc.h
index 99963a7432c71ed4b2f3e232c86382abea8da4f6..d0c23479aaada25837d5f6d0d8378fcb08577936 100644 (file)
--- a/direct/yaffs_malloc.h
+++ b/direct/yaffs_malloc.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_nandif.c b/direct/yaffs_nandif.c
index 6216b868ad763a685f049e88c12e1c0a978a2fae..1d336856e79edb9367672dae7f859475ab32558f 100644 (file)
--- a/direct/yaffs_nandif.c
+++ b/direct/yaffs_nandif.c
@@ -1,8 +1,7 @@
-\r

 /*\r
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.\r
  *\r
 /*\r
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.\r
  *\r

- * Copyright (C) 2002-2007 Aleph One Ltd.\r
+ * Copyright (C) 2002-2010 Aleph One Ltd.\r

  *   for Toby Churchill Ltd and Brightstar Engineering\r
  *\r
  * Created by Charles Manning <charles@aleph1.co.uk>\r
  *   for Toby Churchill Ltd and Brightstar Engineering\r
  *\r
  * Created by Charles Manning <charles@aleph1.co.uk>\r

diff --git a/direct/yaffs_nandif.h b/direct/yaffs_nandif.h
index 1a17262ac5519eb79d7b70b6b3e25f67dfb0572d..f7a67dd070a093a0d6ef72ee3361ad4fa8aa5fa8 100644 (file)
--- a/direct/yaffs_nandif.h
+++ b/direct/yaffs_nandif.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_norif1.c b/direct/yaffs_norif1.c
index 376d330d5c8fe26161322c810fe7c79b06bafb2f..ab582b03639f4b8420db1d4a168a49a0fbb0009b 100644 (file)
--- a/direct/yaffs_norif1.c
+++ b/direct/yaffs_norif1.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_norif1.h b/direct/yaffs_norif1.h
index bee10e963e10bdc061d3d5e5b62381fb72cd3e9b..2ab11d29830801259b105e8ef5dbb8d10af3f1cd 100644 (file)
--- a/direct/yaffs_norif1.h
+++ b/direct/yaffs_norif1.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_ramdisk.c b/direct/yaffs_ramdisk.c
index 0889fb23c2d531ae3092e5c7cbd65425f62d2c96..d44c3daa4b2119c0fed54a5e611c056e0af51af6 100644 (file)
--- a/direct/yaffs_ramdisk.c
+++ b/direct/yaffs_ramdisk.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_ramdisk.h b/direct/yaffs_ramdisk.h
index 45659980bbe09a22a167adf577d88b6b8686480a..57af69a91682c97505dbd11aae7789bfbf163a5c 100644 (file)
--- a/direct/yaffs_ramdisk.h
+++ b/direct/yaffs_ramdisk.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffs_ramem2k.c b/direct/yaffs_ramem2k.c
index c623e397aeac652df90e1997ee15b557bee78db1..b3a8724536fc3066a016bd3cd331bad299572b15 100644 (file)
--- a/direct/yaffs_ramem2k.c
+++ b/direct/yaffs_ramem2k.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffscfg.c b/direct/yaffscfg.c
index dd95a7477585d240f41f42b8ed4dd521d9f29e5a..0d83c654591d9b7b89e9f0e37bba0573ff45db69 100644 (file)
--- a/direct/yaffscfg.c
+++ b/direct/yaffscfg.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffscfg.h b/direct/yaffscfg.h
index 0d317fcd34f48f5e7098f1cfb896cd8c791f3ccb..2b46b392d3a55fb61ac142a5aad05ce2561fd9e8 100644 (file)
--- a/direct/yaffscfg.h
+++ b/direct/yaffscfg.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index 92785e1248316d61cd596d348af4a6e2c5ca8ae7..07c1df39c0d1498e51edaa3ad90363a7fba90ec2 100644 (file)
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 7e2fc39908df33f1903be17c45333a89fac3a8f4..3a2cdf336ba69679ebf504c65dde736a2c9dab0a 100644 (file)
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/yaffsfs.h b/direct/yaffsfs.h
index b53c9aece76dc251c5c9d6e95abe52f187dd27d9..fc6152ceaf37e2c4751992720ff2a64c3a452868 100644 (file)
--- a/direct/yaffsfs.h
+++ b/direct/yaffsfs.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index 68c99dbd9e95998b214f1d83e30753698e079ff2..fc9aefc1fb3beb02cbb6deb34d7fb865d7ed3b84 100644 (file)
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/moduleconfig.h b/moduleconfig.h
index 398e8518a031ee2f730390a15b2191b0a6050453..89eeec83585026cf81a183322869c5aed88a157f 100644 (file)
--- a/moduleconfig.h
+++ b/moduleconfig.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Martin Fouts <Martin.Fouts@palmsource.com>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Martin Fouts <Martin.Fouts@palmsource.com>

diff --git a/patch-ker.sh b/patch-ker.sh
index ee3cdbc9ad8ce958535850c981b17a95334faa24..67e7a519487bcf891520ad9f3911990606245c82 100755 (executable)
--- a/patch-ker.sh
+++ b/patch-ker.sh
@@ -2,7 +2,7 @@
 #
 # YAFFS: Yet another FFS. A NAND-flash specific file system.
 #
 #
 # YAFFS: Yet another FFS. A NAND-flash specific file system.
 #

-# Copyright (C) 2002-2006 Aleph One Ltd.
+# Copyright (C) 2002-2010 Aleph One Ltd.

 #
 # Created by Charles Manning <charles@aleph1.co.uk>
 #
 #
 # Created by Charles Manning <charles@aleph1.co.uk>
 #


@@ -16,7 +16,6 @@
 #
 #  Somewhat "inspired by" the mtd patchin script
 #
 #
 #  Somewhat "inspired by" the mtd patchin script
 #

-#  $Id: patch-ker.sh,v 1.5 2009-01-22 00:44:46 charles Exp $

 
 VERSION=0
 PATCHLEVEL=0
 
 VERSION=0
 PATCHLEVEL=0

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index 7ae263caae8c7b7000fda09db4e5efe480c28a28..1304c19c185a56abe8a97204ddc91055fb504669 100644 (file)
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -11,10 +11,6 @@
  * published by the Free Software Foundation.
  */
 
  * published by the Free Software Foundation.
  */
 

-const char *yaffs_checkptrw_c_version =
-       "$Id: yaffs_checkptrw.c,v 1.23 2010-02-18 01:18:04 charles Exp $";
-
-

 #include "yaffs_checkptrw.h"
 #include "yaffs_getblockinfo.h"
 
 #include "yaffs_checkptrw.h"
 #include "yaffs_getblockinfo.h"
 

diff --git a/yaffs_checkptrw.h b/yaffs_checkptrw.h
index 5d426ea8d77982d39ca28e63096a16aca77ce04e..3350d1ecbf8e78c787b34a7fba3c27e5b6bb16e6 100644 (file)
--- a/yaffs_checkptrw.h
+++ b/yaffs_checkptrw.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_ecc.c b/yaffs_ecc.c
index d037e90a2472c39b032096dd344b5f0f86e9ce97..da6145aac27a1c3f8a583ea009ca70aecc9e1f79 100644 (file)
--- a/yaffs_ecc.c
+++ b/yaffs_ecc.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -28,9 +28,6 @@
  * this bytes influence on the line parity.
  */
 
  * this bytes influence on the line parity.
  */
 

-const char *yaffs_ecc_c_version =
-       "$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
-

 #include "yportenv.h"
 
 #include "yaffs_ecc.h"
 #include "yportenv.h"
 
 #include "yaffs_ecc.h"

diff --git a/yaffs_ecc.h b/yaffs_ecc.h
index 60765176e8dce143c7c3f1ed972abe098cd8bf4b..a1ee69ac7f2415e721fd0e2d55fbe198d7c87911 100644 (file)
--- a/yaffs_ecc.h
+++ b/yaffs_ecc.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_fs.c b/yaffs_fs.c
index caade8ae1f06931d9290a9286536e30e4abde38a..07ff66e13e9c965b842b47459df59d2d27dca369 100644 (file)
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2009 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -31,10 +31,6 @@
  * >> inode->u.generic_ip points to the associated yaffs_Object.
  */
 
  * >> inode->u.generic_ip points to the associated yaffs_Object.
  */
 

-const char *yaffs_fs_c_version =
-    "$Id: yaffs_fs.c,v 1.102 2010-03-15 23:10:33 charles Exp $";
-extern const char *yaffs_guts_c_version;
-

 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))


@@ -49,6 +45,7 @@ extern const char *yaffs_guts_c_version;
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
 #include <linux/config.h>
 #endif
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
 #include <linux/config.h>
 #endif

+

 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>


@@ -72,16 +69,12 @@ extern const char *yaffs_guts_c_version;
 #include <linux/freezer.h>
 #endif
 
 #include <linux/freezer.h>
 #endif
 

-
-#include "asm/div64.h"
-
-
-#define LOCK_TRACE 0
+#include <asm/div64.h>

 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
 
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
 

-#include <linux/statfs.h>      /* Added NCB 15-8-2003 */

 #include <linux/statfs.h>
 #include <linux/statfs.h>

+

 #define UnlockPage(p) unlock_page(p)
 #define Page_Uptodate(page)    test_bit(PG_uptodate, &(page)->flags)
 
 #define UnlockPage(p) unlock_page(p)
 #define Page_Uptodate(page)    test_bit(PG_uptodate, &(page)->flags)
 


@@ -133,6 +126,7 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
 #endif
 
 #include <linux/uaccess.h>
 #endif
 
 #include <linux/uaccess.h>

+#include <linux/mtd/mtd.h>

 
 #include "yportenv.h"
 #include "yaffs_trace.h"
 
 #include "yportenv.h"
 #include "yaffs_trace.h"


@@ -140,7 +134,6 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
 
 #include "yaffs_linux.h"
 
 
 #include "yaffs_linux.h"
 

-#include <linux/mtd/mtd.h>

 #include "yaffs_mtdif.h"
 #include "yaffs_mtdif1.h"
 #include "yaffs_mtdif2.h"
 #include "yaffs_mtdif.h"
 #include "yaffs_mtdif1.h"
 #include "yaffs_mtdif2.h"


@@ -176,8 +169,6 @@ static void yaffs_read_inode(struct inode *inode);
 static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
 #endif
 
 static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino);
 #endif
 

-/*#define T(x) printk x */
-

 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
 #define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
 #else
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18))
 #define yaffs_InodeToObjectLV(iptr) ((iptr)->i_private)
 #else


@@ -415,14 +406,14 @@ static unsigned yaffs_gc_control_callback(yaffs_Device *dev)
                                                                                                                        
 static void yaffs_GrossLock(yaffs_Device *dev)
 {
                                                                                                                        
 static void yaffs_GrossLock(yaffs_Device *dev)
 {

-       T(LOCK_TRACE && YAFFS_TRACE_OS, ("yaffs locking %p\n", current));
+       T(YAFFS_TRACE_LOCK, (TSTR("yaffs locking %p\n"), current));

        down(&(yaffs_DeviceToContext(dev)->grossLock));
        down(&(yaffs_DeviceToContext(dev)->grossLock));

-       T(LOCK_TRACE && YAFFS_TRACE_OS, ("yaffs locked %p\n", current));
+       T(YAFFS_TRACE_LOCK, (TSTR("yaffs locked %p\n"), current));

 }
 
 static void yaffs_GrossUnlock(yaffs_Device *dev)
 {
 }
 
 static void yaffs_GrossUnlock(yaffs_Device *dev)
 {

-       T(LOCK_TRACE && YAFFS_TRACE_OS, ("yaffs unlocking %p\n", current));
+       T(YAFFS_TRACE_LOCK, (TSTR("yaffs unlocking %p\n"), current));

        up(&(yaffs_DeviceToContext(dev)->grossLock));
 }
 
        up(&(yaffs_DeviceToContext(dev)->grossLock));
 }
 


@@ -480,7 +471,7 @@ struct dentry *yaffs2_get_parent(struct dentry *dentry)
 }
 
 /* Just declare a zero structure as a NULL value implies
 }
 
 /* Just declare a zero structure as a NULL value implies

- * using the default functions of expfs.
+ * using the default functions of exportfs.

  */
 
 static struct export_operations yaffs_export_ops =
  */
 
 static struct export_operations yaffs_export_ops =


@@ -683,7 +674,7 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
                yaffs_GrossLock(dev);
 
        T(YAFFS_TRACE_OS,
                yaffs_GrossLock(dev);
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_lookup for %d:%s\n",
+               (TSTR("yaffs_lookup for %d:%s\n"),

                yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
 
        obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),
                yaffs_InodeToObject(dir)->objectId, dentry->d_name.name));
 
        obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),


@@ -697,13 +688,13 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
 
        if (obj) {
                T(YAFFS_TRACE_OS,
 
        if (obj) {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_lookup found %d\n", obj->objectId));
+                       (TSTR("yaffs_lookup found %d\n"), obj->objectId));

 
                inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
 
                if (inode) {
                        T(YAFFS_TRACE_OS,
 
                inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
 
                if (inode) {
                        T(YAFFS_TRACE_OS,

-                               ("yaffs_loookup dentry \n"));
+                               (TSTR("yaffs_loookup dentry \n")));

 /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
  * d_add even if NULL inode */
 #if 0
 /* #if 0 asserted by NCB for 2.5/6 compatability - falls through to
  * d_add even if NULL inode */
 #if 0


@@ -716,7 +707,7 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
                }
 
        } else {
                }
 
        } else {

-               T(YAFFS_TRACE_OS, ("yaffs_lookup not found\n"));
+               T(YAFFS_TRACE_OS,(TSTR("yaffs_lookup not found\n")));

 
        }
 
 
        }
 


@@ -736,7 +727,7 @@ static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
 static void yaffs_put_inode(struct inode *inode)
 {
        T(YAFFS_TRACE_OS,
 static void yaffs_put_inode(struct inode *inode)
 {
        T(YAFFS_TRACE_OS,

-               ("yaffs_put_inode: ino %d, count %d\n", (int)inode->i_ino,
+               (TSTR("yaffs_put_inode: ino %d, count %d\n"), (int)inode->i_ino,

                atomic_read(&inode->i_count)));
 
 }
                atomic_read(&inode->i_count)));
 
 }


@@ -751,7 +742,7 @@ static void yaffs_clear_inode(struct inode *inode)
        obj = yaffs_InodeToObject(inode);
 
        T(YAFFS_TRACE_OS,
        obj = yaffs_InodeToObject(inode);
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_clear_inode: ino %d, count %d %s\n", (int)inode->i_ino,
+               (TSTR("yaffs_clear_inode: ino %d, count %d %s\n"), (int)inode->i_ino,

                atomic_read(&inode->i_count),
                obj ? "object exists" : "null object"));
 
                atomic_read(&inode->i_count),
                obj ? "object exists" : "null object"));
 


@@ -788,7 +779,7 @@ static void yaffs_delete_inode(struct inode *inode)
        yaffs_Device *dev;
 
        T(YAFFS_TRACE_OS,
        yaffs_Device *dev;
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_delete_inode: ino %d, count %d %s\n", (int)inode->i_ino,
+               (TSTR("yaffs_delete_inode: ino %d, count %d %s\n"), (int)inode->i_ino,

                atomic_read(&inode->i_count),
                obj ? "object exists" : "null object"));
 
                atomic_read(&inode->i_count),
                obj ? "object exists" : "null object"));
 


@@ -815,7 +806,7 @@ static int yaffs_file_flush(struct file *file)
        yaffs_Device *dev = obj->myDev;
 
        T(YAFFS_TRACE_OS,
        yaffs_Device *dev = obj->myDev;
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_file_flush object %d (%s)\n", obj->objectId,
+               (TSTR("yaffs_file_flush object %d (%s)\n"), obj->objectId,

                obj->dirty ? "dirty" : "clean"));
 
        yaffs_GrossLock(dev);
                obj->dirty ? "dirty" : "clean"));
 
        yaffs_GrossLock(dev);


@@ -837,9 +828,10 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg)
 
        yaffs_Device *dev;
 
 
        yaffs_Device *dev;
 

-       T(YAFFS_TRACE_OS, ("yaffs_readpage_nolock at %08x, size %08x\n",
-                       (unsigned)(pg->index << PAGE_CACHE_SHIFT),
-                       (unsigned)PAGE_CACHE_SIZE));
+       T(YAFFS_TRACE_OS,
+               (TSTR("yaffs_readpage_nolock at %08x, size %08x\n"),
+               (unsigned)(pg->index << PAGE_CACHE_SHIFT),
+               (unsigned)PAGE_CACHE_SIZE));

 
        obj = yaffs_DentryToObject(f->f_dentry);
 
 
        obj = yaffs_DentryToObject(f->f_dentry);
 


@@ -877,7 +869,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg)
        flush_dcache_page(pg);
        kunmap(pg);
 
        flush_dcache_page(pg);
        kunmap(pg);
 

-       T(YAFFS_TRACE_OS, ("yaffs_readpage_nolock done\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage_nolock done\n")));

        return ret;
 }
 
        return ret;
 }
 


@@ -892,9 +884,9 @@ static int yaffs_readpage(struct file *f, struct page *pg)
 {
        int ret;
 
 {
        int ret;
 

-       T(YAFFS_TRACE_OS, ("yaffs_readpage\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage\n")));

        ret=yaffs_readpage_unlock(f, pg);
        ret=yaffs_readpage_unlock(f, pg);

-       T(YAFFS_TRACE_OS, ("yaffs_readpage done\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_readpage done\n")));

        return ret;
 }
 
        return ret;
 }
 


@@ -931,11 +923,11 @@ static int yaffs_writepage(struct page *page)
 
                if (page->index > end_index || !nBytes) {
                        T(YAFFS_TRACE_OS,
 
                if (page->index > end_index || !nBytes) {
                        T(YAFFS_TRACE_OS,

-                               ("yaffs_writepage at %08x, inode size = %08x!!!\n",
+                               (TSTR("yaffs_writepage at %08x, inode size = %08x!!!\n"),

                                (unsigned)(page->index << PAGE_CACHE_SHIFT),
                                (unsigned)inode->i_size));
                        T(YAFFS_TRACE_OS,
                                (unsigned)(page->index << PAGE_CACHE_SHIFT),
                                (unsigned)inode->i_size));
                        T(YAFFS_TRACE_OS,

-                               ("                -> don't care!!\n"));
+                               (TSTR("                -> don't care!!\n")));

 
                        zero_user_segment(page,0,PAGE_CACHE_SIZE);
                        set_page_writeback(page);
 
                        zero_user_segment(page,0,PAGE_CACHE_SIZE);
                        set_page_writeback(page);


@@ -956,17 +948,17 @@ static int yaffs_writepage(struct page *page)
        yaffs_GrossLock(obj->myDev);
 
        T(YAFFS_TRACE_OS,
        yaffs_GrossLock(obj->myDev);
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_writepage at %08x, size %08x\n",
+               (TSTR("yaffs_writepage at %08x, size %08x\n"),

                (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
        T(YAFFS_TRACE_OS,
                (unsigned)(page->index << PAGE_CACHE_SHIFT), nBytes));
        T(YAFFS_TRACE_OS,

-               ("writepag0: obj = %05x, ino = %05x\n",
+               (TSTR("writepag0: obj = %05x, ino = %05x\n"),

                (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
 
        nWritten = yaffs_WriteDataToFile(obj, buffer,
                        page->index << PAGE_CACHE_SHIFT, nBytes, 0);
 
        T(YAFFS_TRACE_OS,
                (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
 
        nWritten = yaffs_WriteDataToFile(obj, buffer,
                        page->index << PAGE_CACHE_SHIFT, nBytes, 0);
 
        T(YAFFS_TRACE_OS,

-               ("writepag1: obj = %05x, ino = %05x\n",
+               (TSTR("writepag1: obj = %05x, ino = %05x\n"),

                (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
 
        yaffs_GrossUnlock(obj->myDev);
                (int)obj->variant.fileVariant.fileSize, (int)inode->i_size));
 
        yaffs_GrossUnlock(obj->myDev);


@@ -1004,7 +996,9 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
                ret =  -ENOMEM;
                goto out;
        }
                ret =  -ENOMEM;
                goto out;
        }

-       T(YAFFS_TRACE_OS, ("start yaffs_write_begin index %d(%x) uptodate %d\n",(int)index,(int)index,Page_Uptodate(pg) ? 1 : 0));
+       T(YAFFS_TRACE_OS,
+               (TSTR("start yaffs_write_begin index %d(%x) uptodate %d\n"),
+               (int)index,(int)index,Page_Uptodate(pg) ? 1 : 0));

 
        /* Get fs space */
        space_held = yaffs_hold_space(filp);
 
        /* Get fs space */
        space_held = yaffs_hold_space(filp);


@@ -1023,12 +1017,13 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping,
                goto out;
 
        /* Happy path return */
                goto out;
 
        /* Happy path return */

-       T(YAFFS_TRACE_OS, ("end yaffs_write_begin - ok\n"));
+       T(YAFFS_TRACE_OS, (TSTR("end yaffs_write_begin - ok\n")));

 
        return 0;
 
 out:
 
        return 0;
 
 out:

-       T(YAFFS_TRACE_OS, ("end yaffs_write_begin fail returning %d\n", ret));
+       T(YAFFS_TRACE_OS,
+               (TSTR("end yaffs_write_begin fail returning %d\n"), ret));

        if (space_held)
                yaffs_release_space(filp);
        if (pg) {
        if (space_held)
                yaffs_release_space(filp);
        if (pg) {


@@ -1043,7 +1038,7 @@ out:
 static int yaffs_prepare_write(struct file *f, struct page *pg,
                                unsigned offset, unsigned to)
 {
 static int yaffs_prepare_write(struct file *f, struct page *pg,
                                unsigned offset, unsigned to)
 {

-       T(YAFFS_TRACE_OS, ("yaffs_prepair_write\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_prepair_write\n")));

 
        if (!Page_Uptodate(pg))
                return yaffs_readpage_nolock(f, pg);
 
        if (!Page_Uptodate(pg))
                return yaffs_readpage_nolock(f, pg);


@@ -1071,7 +1066,7 @@ static int yaffs_write_end(struct file *filp, struct address_space *mapping,
 
        if (ret != copied) {
                T(YAFFS_TRACE_OS,
 
        if (ret != copied) {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_write_end not same size ret %d  copied %d\n",
+                       (TSTR("yaffs_write_end not same size ret %d  copied %d\n"),

                        ret, copied));
                SetPageError(pg);
        } else {
                        ret, copied));
                SetPageError(pg);
        } else {


@@ -1105,14 +1100,14 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
        saddr = (unsigned) addr;
 
        T(YAFFS_TRACE_OS,
        saddr = (unsigned) addr;
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_commit_write addr %x pos %x nBytes %d\n",
+               (TSTR("yaffs_commit_write addr %x pos %x nBytes %d\n"),

                saddr, spos, nBytes));
 
        nWritten = yaffs_file_write(f, addr, nBytes, &pos);
 
        if (nWritten != nBytes) {
                T(YAFFS_TRACE_OS,
                saddr, spos, nBytes));
 
        nWritten = yaffs_file_write(f, addr, nBytes, &pos);
 
        if (nWritten != nBytes) {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_commit_write not same size nWritten %d  nBytes %d\n",
+                       (TSTR("yaffs_commit_write not same size nWritten %d  nBytes %d\n"),

                        nWritten, nBytes));
                SetPageError(pg);
        } else {
                        nWritten, nBytes));
                SetPageError(pg);
        } else {


@@ -1122,7 +1117,7 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
        kunmap(pg);
 
        T(YAFFS_TRACE_OS,
        kunmap(pg);
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_commit_write returning %d\n",
+               (TSTR("yaffs_commit_write returning %d\n"),

                nWritten == nBytes ? 0 : nWritten));
 
        return nWritten == nBytes ? 0 : nWritten;
                nWritten == nBytes ? 0 : nWritten));
 
        return nWritten == nBytes ? 0 : nWritten;


@@ -1197,7 +1192,7 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
                inode->i_nlink = yaffs_GetObjectLinkCount(obj);
 
                T(YAFFS_TRACE_OS,
                inode->i_nlink = yaffs_GetObjectLinkCount(obj);
 
                T(YAFFS_TRACE_OS,

-                       ("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
+                       (TSTR("yaffs_FillInode mode %x uid %d gid %d size %d count %d\n"),

                        inode->i_mode, inode->i_uid, inode->i_gid,
                        (int)inode->i_size, atomic_read(&inode->i_count)));
 
                        inode->i_mode, inode->i_uid, inode->i_gid,
                        (int)inode->i_size, atomic_read(&inode->i_count)));
 


@@ -1232,7 +1227,7 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
 
        } else {
                T(YAFFS_TRACE_OS,
 
        } else {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_FileInode invalid parameters\n"));
+                       (TSTR("yaffs_FileInode invalid parameters\n")));

        }
 
 }
        }
 
 }


@@ -1244,20 +1239,20 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
 
        if (!sb) {
                T(YAFFS_TRACE_OS,
 
        if (!sb) {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_get_inode for NULL super_block!!\n"));
+                       (TSTR("yaffs_get_inode for NULL super_block!!\n")));

                return NULL;
 
        }
 
        if (!obj) {
                T(YAFFS_TRACE_OS,
                return NULL;
 
        }
 
        if (!obj) {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_get_inode for NULL object!!\n"));
+                       (TSTR("yaffs_get_inode for NULL object!!\n")));

                return NULL;
 
        }
 
        T(YAFFS_TRACE_OS,
                return NULL;
 
        }
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_get_inode for object %d\n", obj->objectId));
+               (TSTR("yaffs_get_inode for object %d\n"), obj->objectId));

 
        inode = Y_IGET(sb, obj->objectId);
        if (IS_ERR(inode))
 
        inode = Y_IGET(sb, obj->objectId);
        if (IS_ERR(inode))


@@ -1293,17 +1288,17 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
 
        if (!obj)
                T(YAFFS_TRACE_OS,
 
        if (!obj)
                T(YAFFS_TRACE_OS,

-                       ("yaffs_file_write: hey obj is null!\n"));
+                       (TSTR("yaffs_file_write: hey obj is null!\n")));

        else
                T(YAFFS_TRACE_OS,
        else
                T(YAFFS_TRACE_OS,

-                       ("yaffs_file_write about to write writing %u(%x) bytes"
-                       "to object %d at %d(%x)\n",
+                       (TSTR("yaffs_file_write about to write writing %u(%x) bytes"
+                       "to object %d at %d(%x)\n"),

                        (unsigned) n, (unsigned) n, obj->objectId, ipos,ipos));
 
        nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
 
        T(YAFFS_TRACE_OS,
                        (unsigned) n, (unsigned) n, obj->objectId, ipos,ipos));
 
        nWritten = yaffs_WriteDataToFile(obj, buf, ipos, n, 0);
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_file_write: %d(%x) bytes written\n",
+               (TSTR("yaffs_file_write: %d(%x) bytes written\n"),

                (unsigned )n,(unsigned)n));
 
        if (nWritten > 0) {
                (unsigned )n,(unsigned)n));
 
        if (nWritten > 0) {


@@ -1314,8 +1309,8 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,
                        inode->i_blocks = (ipos + 511) >> 9;
 
                        T(YAFFS_TRACE_OS,
                        inode->i_blocks = (ipos + 511) >> 9;
 
                        T(YAFFS_TRACE_OS,

-                               ("yaffs_file_write size updated to %d bytes, "
-                               "%d blocks\n",
+                               (TSTR("yaffs_file_write size updated to %d bytes, "
+                               "%d blocks\n"),

                                ipos, (int)(inode->i_blocks)));
                }
 
                                ipos, (int)(inode->i_blocks)));
                }
 


@@ -1419,11 +1414,11 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
                 goto unlock_out;
         }
 
                 goto unlock_out;
         }
 

-       T(YAFFS_TRACE_OS, ("yaffs_readdir: starting at %d\n", (int)offset));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_readdir: starting at %d\n"), (int)offset));

 
        if (offset == 0) {
                T(YAFFS_TRACE_OS,
 
        if (offset == 0) {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_readdir: entry . ino %d \n",
+                       (TSTR("yaffs_readdir: entry . ino %d \n"),

                        (int)inode->i_ino));
                yaffs_GrossUnlock(dev);
                if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)
                        (int)inode->i_ino));
                yaffs_GrossUnlock(dev);
                if (filldir(dirent, ".", 1, offset, inode->i_ino, DT_DIR) < 0)


@@ -1434,7 +1429,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
        }
        if (offset == 1) {
                T(YAFFS_TRACE_OS,
        }
        if (offset == 1) {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_readdir: entry .. ino %d \n",
+                       (TSTR("yaffs_readdir: entry .. ino %d \n"),

                        (int)f->f_dentry->d_parent->d_inode->i_ino));
                yaffs_GrossUnlock(dev);
                if (filldir(dirent, "..", 2, offset,
                        (int)f->f_dentry->d_parent->d_inode->i_ino));
                yaffs_GrossUnlock(dev);
                if (filldir(dirent, "..", 2, offset,


@@ -1465,8 +1460,8 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
                        yaffs_GetObjectName(l, name,
                                            YAFFS_MAX_NAME_LENGTH + 1);
                        T(YAFFS_TRACE_OS,
                        yaffs_GetObjectName(l, name,
                                            YAFFS_MAX_NAME_LENGTH + 1);
                        T(YAFFS_TRACE_OS,

-                         ("yaffs_readdir: %s inode %d\n", name,
-                          yaffs_GetObjectInode(l)));
+                         (TSTR("yaffs_readdir: %s inode %d\n"),
+                         name, yaffs_GetObjectInode(l)));

 
                         yaffs_GrossUnlock(dev);
 
 
                         yaffs_GrossUnlock(dev);
 


@@ -1532,16 +1527,16 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
 
        if (parent) {
                T(YAFFS_TRACE_OS,
 
        if (parent) {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_mknod: parent object %d type %d\n",
+                       (TSTR("yaffs_mknod: parent object %d type %d\n"),

                        parent->objectId, parent->variantType));
        } else {
                T(YAFFS_TRACE_OS,
                        parent->objectId, parent->variantType));
        } else {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_mknod: could not get parent object\n"));
+                       (TSTR("yaffs_mknod: could not get parent object\n")));

                return -EPERM;
        }
 
                return -EPERM;
        }
 

-       T(YAFFS_TRACE_OS, ("yaffs_mknod: making oject for %s, "
-                       "mode %x dev %x\n",
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making oject for %s, "
+                       "mode %x dev %x\n"),

                        dentry->d_name.name, mode, rdev));
 
        dev = parent->myDev;
                        dentry->d_name.name, mode, rdev));
 
        dev = parent->myDev;


@@ -1551,7 +1546,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
        switch (mode & S_IFMT) {
        default:
                /* Special (socket, fifo, device...) */
        switch (mode & S_IFMT) {
        default:
                /* Special (socket, fifo, device...) */

-               T(YAFFS_TRACE_OS, ("yaffs_mknod: making special\n"));
+               T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making special\n")));

 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
                obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
                                gid, old_encode_dev(rdev));
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
                obj = yaffs_MknodSpecial(parent, dentry->d_name.name, mode, uid,
                                gid, old_encode_dev(rdev));


@@ -1561,18 +1556,18 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
 #endif
                break;
        case S_IFREG:           /* file          */
 #endif
                break;
        case S_IFREG:           /* file          */

-               T(YAFFS_TRACE_OS, ("yaffs_mknod: making file\n"));
+               T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making file\n")));

                obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
                                gid);
                break;
        case S_IFDIR:           /* directory */
                T(YAFFS_TRACE_OS,
                obj = yaffs_MknodFile(parent, dentry->d_name.name, mode, uid,
                                gid);
                break;
        case S_IFDIR:           /* directory */
                T(YAFFS_TRACE_OS,

-                       ("yaffs_mknod: making directory\n"));
+                       (TSTR("yaffs_mknod: making directory\n")));

                obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
                                        uid, gid);
                break;
        case S_IFLNK:           /* symlink */
                obj = yaffs_MknodDirectory(parent, dentry->d_name.name, mode,
                                        uid, gid);
                break;
        case S_IFLNK:           /* symlink */

-               T(YAFFS_TRACE_OS, ("yaffs_mknod: making symlink\n"));
+               T(YAFFS_TRACE_OS, (TSTR("yaffs_mknod: making symlink\n")));

                obj = NULL;     /* Do we ever get here? */
                break;
        }
                obj = NULL;     /* Do we ever get here? */
                break;
        }


@@ -1585,13 +1580,13 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
                d_instantiate(dentry, inode);
                update_dir_time(dir);
                T(YAFFS_TRACE_OS,
                d_instantiate(dentry, inode);
                update_dir_time(dir);
                T(YAFFS_TRACE_OS,

-                       ("yaffs_mknod created object %d count = %d\n",
+                       (TSTR("yaffs_mknod created object %d count = %d\n"),

                        obj->objectId, atomic_read(&inode->i_count)));
                error = 0;
                yaffs_FillInodeFromObject(dir,parent);
        } else {
                T(YAFFS_TRACE_OS,
                        obj->objectId, atomic_read(&inode->i_count)));
                error = 0;
                yaffs_FillInodeFromObject(dir,parent);
        } else {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_mknod failed making object\n"));
+                       (TSTR("yaffs_mknod failed making object\n")));

                error = -ENOMEM;
        }
 
                error = -ENOMEM;
        }
 


@@ -1601,7 +1596,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
 static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
        int retVal;
 static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
        int retVal;

-       T(YAFFS_TRACE_OS, ("yaffs_mkdir\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_mkdir\n")));

        retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
        return retVal;
 }
        retVal = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
        return retVal;
 }


@@ -1613,7 +1608,7 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode,
 static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
 #endif
 {
 static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
 #endif
 {

-       T(YAFFS_TRACE_OS, ("yaffs_create\n"));
+       T(YAFFS_TRACE_OS,(TSTR("yaffs_create\n")));

        return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
 }
 
        return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
 }
 


@@ -1625,7 +1620,8 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry)
        yaffs_Object *obj;
 
        T(YAFFS_TRACE_OS,
        yaffs_Object *obj;
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_unlink %d:%s\n", (int)(dir->i_ino),
+               (TSTR("yaffs_unlink %d:%s\n"),
+               (int)(dir->i_ino),

                dentry->d_name.name));
        obj = yaffs_InodeToObject(dir);
        dev = obj->myDev;
                dentry->d_name.name));
        obj = yaffs_InodeToObject(dir);
        dev = obj->myDev;


@@ -1657,7 +1653,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
        yaffs_Object *link = NULL;
        yaffs_Device *dev;
 
        yaffs_Object *link = NULL;
        yaffs_Device *dev;
 

-       T(YAFFS_TRACE_OS, ("yaffs_link\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_link\n")));

 
        obj = yaffs_InodeToObject(inode);
        dev = obj->myDev;
 
        obj = yaffs_InodeToObject(inode);
        dev = obj->myDev;


@@ -1673,7 +1669,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir,
                d_instantiate(dentry, old_dentry->d_inode);
                atomic_inc(&old_dentry->d_inode->i_count);
                T(YAFFS_TRACE_OS,
                d_instantiate(dentry, old_dentry->d_inode);
                atomic_inc(&old_dentry->d_inode->i_count);
                T(YAFFS_TRACE_OS,

-                       ("yaffs_link link count %d i_count %d\n",
+                       (TSTR("yaffs_link link count %d i_count %d\n"),

                        old_dentry->d_inode->i_nlink,
                        atomic_read(&old_dentry->d_inode->i_count)));
        }
                        old_dentry->d_inode->i_nlink,
                        atomic_read(&old_dentry->d_inode->i_count)));
        }


@@ -1696,7 +1692,7 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
        uid_t uid = YCRED(current)->fsuid;
        gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
 
        uid_t uid = YCRED(current)->fsuid;
        gid_t gid = (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid;
 

-       T(YAFFS_TRACE_OS, ("yaffs_symlink\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_symlink\n")));

 
        dev = yaffs_InodeToObject(dir)->myDev;
        yaffs_GrossLock(dev);
 
        dev = yaffs_InodeToObject(dir)->myDev;
        yaffs_GrossLock(dev);


@@ -1710,10 +1706,10 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry,
                inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
                d_instantiate(dentry, inode);
                update_dir_time(dir);
                inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj);
                d_instantiate(dentry, inode);
                update_dir_time(dir);

-               T(YAFFS_TRACE_OS, ("symlink created OK\n"));
+               T(YAFFS_TRACE_OS, (TSTR("symlink created OK\n")));

                return 0;
        } else {
                return 0;
        } else {

-               T(YAFFS_TRACE_OS, ("symlink not created\n"));
+               T(YAFFS_TRACE_OS, (TSTR("symlink not created\n")));

        }
 
        return -ENOMEM;
        }
 
        return -ENOMEM;


@@ -1730,7 +1726,8 @@ static int yaffs_sync_object(struct file *file, struct dentry *dentry,
 
        dev = obj->myDev;
 
 
        dev = obj->myDev;
 

-       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, ("yaffs_sync_object\n"));
+       T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
+               (TSTR("yaffs_sync_object\n")));

        yaffs_GrossLock(dev);
        yaffs_FlushFile(obj, 1, datasync);
        yaffs_GrossUnlock(dev);
        yaffs_GrossLock(dev);
        yaffs_FlushFile(obj, 1, datasync);
        yaffs_GrossUnlock(dev);


@@ -1749,7 +1746,7 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
        int retVal = YAFFS_FAIL;
        yaffs_Object *target;
 
        int retVal = YAFFS_FAIL;
        yaffs_Object *target;
 

-       T(YAFFS_TRACE_OS, ("yaffs_rename\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_rename\n")));

        dev = yaffs_InodeToObject(old_dir)->myDev;
 
        yaffs_GrossLock(dev);
        dev = yaffs_InodeToObject(old_dir)->myDev;
 
        yaffs_GrossLock(dev);


@@ -1763,12 +1760,12 @@ static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry,
        if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
                !ylist_empty(&target->variant.directoryVariant.children)) {
 
        if (target && target->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
                !ylist_empty(&target->variant.directoryVariant.children)) {
 

-               T(YAFFS_TRACE_OS, ("target is non-empty dir\n"));
+               T(YAFFS_TRACE_OS, (TSTR("target is non-empty dir\n")));

 
                retVal = YAFFS_FAIL;
        } else {
                /* Now does unlinking internally using shadowing mechanism */
 
                retVal = YAFFS_FAIL;
        } else {
                /* Now does unlinking internally using shadowing mechanism */

-               T(YAFFS_TRACE_OS, ("calling yaffs_RenameObject\n"));
+               T(YAFFS_TRACE_OS, (TSTR("calling yaffs_RenameObject\n")));

 
                retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
                                old_dentry->d_name.name,
 
                retVal = yaffs_RenameObject(yaffs_InodeToObject(old_dir),
                                old_dentry->d_name.name,


@@ -1799,7 +1796,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
        yaffs_Device *dev;
 
        T(YAFFS_TRACE_OS,
        yaffs_Device *dev;
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_setattr of object %d\n",
+               (TSTR("yaffs_setattr of object %d\n"),

                yaffs_InodeToObject(inode)->objectId));
 
        /* Fail if a requested resize >= 2GB */         
                yaffs_InodeToObject(inode)->objectId));
 
        /* Fail if a requested resize >= 2GB */         


@@ -1813,13 +1810,14 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
                int result;
                if (!error){
                        error = inode_setattr(inode, attr);
                int result;
                if (!error){
                        error = inode_setattr(inode, attr);

-                       T(YAFFS_TRACE_OS,("inode_setattr called\n"));
+                       T(YAFFS_TRACE_OS,(TSTR("inode_setattr called\n")));

                        if (attr->ia_valid & ATTR_SIZE)
                                truncate_inode_pages(&inode->i_data,attr->ia_size);
                }
                dev = yaffs_InodeToObject(inode)->myDev;
                if (attr->ia_valid & ATTR_SIZE){
                        if (attr->ia_valid & ATTR_SIZE)
                                truncate_inode_pages(&inode->i_data,attr->ia_size);
                }
                dev = yaffs_InodeToObject(inode)->myDev;
                if (attr->ia_valid & ATTR_SIZE){

-                       T(YAFFS_TRACE_OS,("resize to %d(%x)\n",(int)(attr->ia_size),(int)(attr->ia_size)));
+                       T(YAFFS_TRACE_OS,(TSTR("resize to %d(%x)\n"),
+                               (int)(attr->ia_size),(int)(attr->ia_size)));

                }
                yaffs_GrossLock(dev);
                result = yaffs_SetAttributes(yaffs_InodeToObject(inode), attr);
                }
                yaffs_GrossLock(dev);
                result = yaffs_SetAttributes(yaffs_InodeToObject(inode), attr);


@@ -1833,7 +1831,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
        }
 
        T(YAFFS_TRACE_OS,
        }
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_setattr done returning %d\n",error));
+               (TSTR("yaffs_setattr done returning %d\n"),error));

 
        return error;
 }
 
        return error;
 }


@@ -1853,7 +1851,7 @@ static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
        yaffs_Device *dev = yaffs_SuperToDevice(sb);
 #endif
 
        yaffs_Device *dev = yaffs_SuperToDevice(sb);
 #endif
 

-       T(YAFFS_TRACE_OS, ("yaffs_statfs\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_statfs\n")));

 
        yaffs_GrossLock(dev);
 
 
        yaffs_GrossLock(dev);
 


@@ -1918,7 +1916,8 @@ static void yaffs_FlushInodes(struct super_block *sb)
        list_for_each_entry(iptr,&sb->s_inodes, i_sb_list){
                obj = yaffs_InodeToObject(iptr);
                if(obj){
        list_for_each_entry(iptr,&sb->s_inodes, i_sb_list){
                obj = yaffs_InodeToObject(iptr);
                if(obj){

-                       T(YAFFS_TRACE_OS, ("flushing obj %d\n",obj->objectId));
+                       T(YAFFS_TRACE_OS, (TSTR("flushing obj %d\n"),
+                               obj->objectId));

                        yaffs_FlushFile(obj,1,0);
                }
        }
                        yaffs_FlushFile(obj,1,0);
                }
        }


@@ -1970,7 +1969,7 @@ static int yaffs_do_sync_fs(struct super_block *sb,
        int do_checkpoint;
 
        T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
        int do_checkpoint;
 
        T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,

-               ("yaffs_do_sync_fs: gc-urgency %d %s %s%s\n",
+               (TSTR("yaffs_do_sync_fs: gc-urgency %d %s %s%s\n"),

                gc_urgent,
                sb->s_dirt ? "dirty" : "clean",
                request_checkpoint ? "checkpoint requested" : "no checkpoint",
                gc_urgent,
                sb->s_dirt ? "dirty" : "clean",
                request_checkpoint ? "checkpoint requested" : "no checkpoint",


@@ -2025,14 +2024,14 @@ static int yaffs_BackgroundThread(void *data)
        struct timer_list timer;
 
        T(YAFFS_TRACE_BACKGROUND,
        struct timer_list timer;
 
        T(YAFFS_TRACE_BACKGROUND,

-               ("yaffs_background starting for dev %p\n",
+               (TSTR("yaffs_background starting for dev %p\n"),

                (void *)dev));
 
        set_freezable();
 
        while(context->bgRunning){
                T(YAFFS_TRACE_BACKGROUND,
                (void *)dev));
 
        set_freezable();
 
        while(context->bgRunning){
                T(YAFFS_TRACE_BACKGROUND,

-                       ("yaffs_background\n"));
+                       (TSTR("yaffs_background\n")));

 
                if(kthread_should_stop())
                        break;
 
                if(kthread_should_stop())
                        break;


@@ -2145,7 +2144,7 @@ static int yaffs_write_super(struct super_block *sb)
        unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2);
 
        T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,
        unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2);
 
        T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND,

-               ("yaffs_write_super%s\n",
+               (TSTR("yaffs_write_super%s\n"),

                request_checkpoint ? " checkpt" : ""));
 
        yaffs_do_sync_fs(sb, request_checkpoint);
                request_checkpoint ? " checkpt" : ""));
 
        yaffs_do_sync_fs(sb, request_checkpoint);


@@ -2165,7 +2164,7 @@ static int yaffs_sync_fs(struct super_block *sb)
        unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1);
 
        T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,
        unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1);
 
        T(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC,

-               ("yaffs_sync_fs%s\n",
+               (TSTR("yaffs_sync_fs%s\n"),

                request_checkpoint ? " checkpt" : ""));
 
        yaffs_do_sync_fs(sb, request_checkpoint);
                request_checkpoint ? " checkpt" : ""));
 
        yaffs_do_sync_fs(sb, request_checkpoint);


@@ -2182,7 +2181,7 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
        yaffs_Device *dev = yaffs_SuperToDevice(sb);
 
        T(YAFFS_TRACE_OS,
        yaffs_Device *dev = yaffs_SuperToDevice(sb);
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_iget for %lu\n", ino));
+               (TSTR("yaffs_iget for %lu\n"), ino));

 
        inode = iget_locked(sb, ino);
        if (!inode)
 
        inode = iget_locked(sb, ino);
        if (!inode)


@@ -2220,7 +2219,7 @@ static void yaffs_read_inode(struct inode *inode)
        yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
 
        T(YAFFS_TRACE_OS,
        yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
 
        T(YAFFS_TRACE_OS,

-               ("yaffs_read_inode for %d\n", (int)inode->i_ino));
+               (TSTR("yaffs_read_inode for %d\n"), (int)inode->i_ino));

 
        if(current != yaffs_DeviceToContext(dev)->readdirProcess)
                yaffs_GrossLock(dev);
 
        if(current != yaffs_DeviceToContext(dev)->readdirProcess)
                yaffs_GrossLock(dev);


@@ -2247,7 +2246,7 @@ static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
                struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
 
                T(YAFFS_TRACE_OS,
                struct mtd_info *mtd = yaffs_SuperToDevice(sb)->genericDevice;
 
                T(YAFFS_TRACE_OS,

-                       ("yaffs_remount_fs: %s: RO\n", dev->name));
+                       (TSTR("yaffs_remount_fs: %s: RO\n"), dev->name));

 
                yaffs_GrossLock(dev);
 
 
                yaffs_GrossLock(dev);
 


@@ -2259,7 +2258,7 @@ static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data)
                yaffs_GrossUnlock(dev);
        } else {
                T(YAFFS_TRACE_OS,
                yaffs_GrossUnlock(dev);
        } else {
                T(YAFFS_TRACE_OS,

-                       ("yaffs_remount_fs: %s: RW\n", dev->name));
+                       (TSTR("yaffs_remount_fs: %s: RW\n"), dev->name));

        }
 
        return 0;
        }
 
        return 0;


@@ -2270,11 +2269,13 @@ static void yaffs_put_super(struct super_block *sb)
 {
        yaffs_Device *dev = yaffs_SuperToDevice(sb);
 
 {
        yaffs_Device *dev = yaffs_SuperToDevice(sb);
 

-       T(YAFFS_TRACE_OS, ("yaffs_put_super\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_put_super\n")));

 
 

-       T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, ("Shutting down yaffs background thread\n"));
+       T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+               (TSTR("Shutting down yaffs background thread\n")));

        yaffs_BackgroundStop(dev);
        yaffs_BackgroundStop(dev);

-       T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, ("yaffs background thread shut down\n"));
+       T(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND,
+               (TSTR("yaffs background thread shut down\n")));

 
        yaffs_GrossLock(dev);
 
 
        yaffs_GrossLock(dev);
 


@@ -2316,7 +2317,7 @@ static void yaffs_MarkSuperBlockDirty(yaffs_Device *dev)
 {
        struct super_block *sb = yaffs_DeviceToContext(dev)->superBlock;
 
 {
        struct super_block *sb = yaffs_DeviceToContext(dev)->superBlock;
 

-       T(YAFFS_TRACE_OS, ("yaffs_MarkSuperBlockDirty() sb = %p\n", sb));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_MarkSuperBlockDirty() sb = %p\n"), sb));

        if (sb)
                sb->s_dirt = 1;
 }
        if (sb)
                sb->s_dirt = 1;
 }


@@ -2448,20 +2449,17 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
 
        sb->s_blocksize = PAGE_CACHE_SIZE;
        sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
 
        sb->s_blocksize = PAGE_CACHE_SIZE;
        sb->s_blocksize_bits = PAGE_CACHE_SHIFT;

-       T(YAFFS_TRACE_OS, ("yaffs_read_super: Using yaffs%d\n", yaffsVersion));
-       T(YAFFS_TRACE_OS,
-         ("yaffs_read_super: block size %d\n", (int)(sb->s_blocksize)));

 
 

-#ifdef CONFIG_YAFFS_DISABLE_WRITE_VERIFY

        T(YAFFS_TRACE_OS,
        T(YAFFS_TRACE_OS,

-         ("yaffs: Write verification disabled. All guarantees "
-          "null and void\n"));
-#endif
+               (TSTR("yaffs_read_super: Using yaffs%d\n"), yaffsVersion));
+       T(YAFFS_TRACE_OS,
+               (TSTR("yaffs_read_super: block size %d\n"),
+               (int)(sb->s_blocksize)));

 
 

-       T(YAFFS_TRACE_ALWAYS, ("yaffs: Attempting MTD mount on %u.%u, "
-                              "\"%s\"\n",
-                              MAJOR(sb->s_dev), MINOR(sb->s_dev),
-                              yaffs_devname(sb, devname_buf)));
+       T(YAFFS_TRACE_ALWAYS,
+               (TSTR("yaffs: Attempting MTD mount of %u.%u,\"%s\"\n"),
+              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)
 
        /* Check it's an mtd device..... */
        if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR)


@@ -2471,43 +2469,46 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
        mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
        if (!mtd) {
                T(YAFFS_TRACE_ALWAYS,
        mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
        if (!mtd) {
                T(YAFFS_TRACE_ALWAYS,

-                 ("yaffs: MTD device #%u doesn't appear to exist\n",
-                  MINOR(sb->s_dev)));
+                       (TSTR("yaffs: MTD device #%u doesn't appear to exist\n"),
+                       MINOR(sb->s_dev)));

                return NULL;
        }
        /* Check it's NAND */
        if (mtd->type != MTD_NANDFLASH) {
                T(YAFFS_TRACE_ALWAYS,
                return NULL;
        }
        /* Check it's NAND */
        if (mtd->type != MTD_NANDFLASH) {
                T(YAFFS_TRACE_ALWAYS,

-                 ("yaffs: MTD device is not NAND it's type %d\n", mtd->type));
+                       (TSTR("yaffs: MTD device is not NAND it's type %d\n"),
+                       mtd->type));

                return NULL;
        }
 
                return NULL;
        }
 

-       T(YAFFS_TRACE_OS, (" erase %p\n", mtd->erase));
-       T(YAFFS_TRACE_OS, (" read %p\n", mtd->read));
-       T(YAFFS_TRACE_OS, (" write %p\n", mtd->write));
-       T(YAFFS_TRACE_OS, (" readoob %p\n", mtd->read_oob));
-       T(YAFFS_TRACE_OS, (" writeoob %p\n", mtd->write_oob));
-       T(YAFFS_TRACE_OS, (" block_isbad %p\n", mtd->block_isbad));
-       T(YAFFS_TRACE_OS, (" block_markbad %p\n", mtd->block_markbad));
-       T(YAFFS_TRACE_OS, (" %s %d\n", WRITE_SIZE_STR, WRITE_SIZE(mtd)));
-       T(YAFFS_TRACE_OS, (" oobsize %d\n", mtd->oobsize));
-       T(YAFFS_TRACE_OS, (" erasesize %d\n", mtd->erasesize));
+       T(YAFFS_TRACE_OS, (TSTR(" erase %p\n"), mtd->erase));
+       T(YAFFS_TRACE_OS, (TSTR(" read %p\n"), mtd->read));
+       T(YAFFS_TRACE_OS, (TSTR(" write %p\n"), mtd->write));
+       T(YAFFS_TRACE_OS, (TSTR(" readoob %p\n"), mtd->read_oob));
+       T(YAFFS_TRACE_OS, (TSTR(" writeoob %p\n"), mtd->write_oob));
+       T(YAFFS_TRACE_OS, (TSTR(" block_isbad %p\n"), mtd->block_isbad));
+       T(YAFFS_TRACE_OS, (TSTR(" block_markbad %p\n"), mtd->block_markbad));
+       T(YAFFS_TRACE_OS, (TSTR(" %s %d\n"), WRITE_SIZE_STR, WRITE_SIZE(mtd)));
+       T(YAFFS_TRACE_OS, (TSTR(" oobsize %d\n"), mtd->oobsize));
+       T(YAFFS_TRACE_OS, (TSTR(" erasesize %d\n"), mtd->erasesize));

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)

-       T(YAFFS_TRACE_OS, (" size %u\n", mtd->size));
+       T(YAFFS_TRACE_OS, (TSTR(" size %u\n"), mtd->size));

 #else
 #else

-       T(YAFFS_TRACE_OS, (" size %lld\n", mtd->size));
+       T(YAFFS_TRACE_OS, (TSTR(" size %lld\n"), mtd->size));

 #endif
 
 #ifdef CONFIG_YAFFS_AUTO_YAFFS2
 
        if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {
 #endif
 
 #ifdef CONFIG_YAFFS_AUTO_YAFFS2
 
        if (yaffsVersion == 1 && WRITE_SIZE(mtd) >= 2048) {

-               T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs2\n"));
+               T(YAFFS_TRACE_ALWAYS,
+                       (TSTR("yaffs: auto selecting yaffs2\n")));

                yaffsVersion = 2;
        }
 
        /* Added NCB 26/5/2006 for completeness */
        if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {
                yaffsVersion = 2;
        }
 
        /* Added NCB 26/5/2006 for completeness */
        if (yaffsVersion == 2 && !options.inband_tags && WRITE_SIZE(mtd) == 512) {

-               T(YAFFS_TRACE_ALWAYS, ("yaffs: auto selecting yaffs1\n"));
+               T(YAFFS_TRACE_ALWAYS,
+                       (TSTR("yaffs: auto selecting yaffs1\n")));

                yaffsVersion = 1;
        }
 
                yaffsVersion = 1;
        }
 


@@ -2527,8 +2528,8 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
                    !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
 #endif
                        T(YAFFS_TRACE_ALWAYS,
                    !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
 #endif
                        T(YAFFS_TRACE_ALWAYS,

-                         ("yaffs: MTD device does not support required "
-                          "functions\n"));;
+                         (TSTR("yaffs: MTD device does not support required "
+                          "functions\n")));

                        return NULL;
                }
 
                        return NULL;
                }
 


@@ -2536,8 +2537,8 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
                    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
                    !options.inband_tags) {
                        T(YAFFS_TRACE_ALWAYS,
                    mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) &&
                    !options.inband_tags) {
                        T(YAFFS_TRACE_ALWAYS,

-                         ("yaffs: MTD device does not have the "
-                          "right page sizes\n"));
+                         (TSTR("yaffs: MTD device does not have the "
+                          "right page sizes\n")));

                        return NULL;
                }
        } else {
                        return NULL;
                }
        } else {


@@ -2552,16 +2553,16 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
                    !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
 #endif
                        T(YAFFS_TRACE_ALWAYS,
                    !mtd->read_ecc || !mtd->read_oob || !mtd->write_oob) {
 #endif
                        T(YAFFS_TRACE_ALWAYS,

-                         ("yaffs: MTD device does not support required "
-                          "functions\n"));;
+                         (TSTR("yaffs: MTD device does not support required "
+                          "functions\n")));

                        return NULL;
                }
 
                if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
                    mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
                        T(YAFFS_TRACE_ALWAYS,
                        return NULL;
                }
 
                if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK ||
                    mtd->oobsize != YAFFS_BYTES_PER_SPARE) {
                        T(YAFFS_TRACE_ALWAYS,

-                         ("yaffs: MTD device does not support have the "
-                          "right page sizes\n"));
+                         (TSTR("yaffs: MTD device does not support have the "
+                          "right page sizes\n")));

                        return NULL;
                }
        }
                        return NULL;
                }
        }


@@ -2586,8 +2587,8 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
        if (!dev) {
                /* Deep shit could not allocate device structure */
                T(YAFFS_TRACE_ALWAYS,
        if (!dev) {
                /* Deep shit could not allocate device structure */
                T(YAFFS_TRACE_ALWAYS,

-                 ("yaffs_read_super: Failed trying to allocate "
-                  "yaffs_Device. \n"));
+                 (TSTR("yaffs_read_super: Failed trying to allocate "
+                  "yaffs_Device. \n")));

                return NULL;
        }
        memset(dev, 0, sizeof(yaffs_Device));
                return NULL;
        }
        memset(dev, 0, sizeof(yaffs_Device));


@@ -2728,7 +2729,7 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
        err = yaffs_GutsInitialise(dev);
 
        T(YAFFS_TRACE_OS,
        err = yaffs_GutsInitialise(dev);
 
        T(YAFFS_TRACE_OS,

-         ("yaffs_read_super: guts initialised %s\n",
+         (TSTR("yaffs_read_super: guts initialised %s\n"),

           (err == YAFFS_OK) ? "OK" : "FAILED"));
           
        if(err == YAFFS_OK)
           (err == YAFFS_OK) ? "OK" : "FAILED"));
           
        if(err == YAFFS_OK)


@@ -2752,11 +2753,11 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
        inode->i_op = &yaffs_dir_inode_operations;
        inode->i_fop = &yaffs_dir_operations;
 
        inode->i_op = &yaffs_dir_inode_operations;
        inode->i_fop = &yaffs_dir_operations;
 

-       T(YAFFS_TRACE_OS, ("yaffs_read_super: got root inode\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: got root inode\n")));

 
        root = d_alloc_root(inode);
 
 
        root = d_alloc_root(inode);
 

-       T(YAFFS_TRACE_OS, ("yaffs_read_super: d_alloc_root done\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: d_alloc_root done\n")));

 
        if (!root) {
                iput(inode);
 
        if (!root) {
                iput(inode);


@@ -2765,9 +2766,10 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
        sb->s_root = root;
        sb->s_dirt = !dev->isCheckpointed;
        T(YAFFS_TRACE_ALWAYS,
        sb->s_root = root;
        sb->s_dirt = !dev->isCheckpointed;
        T(YAFFS_TRACE_ALWAYS,

-         ("yaffs_read_super: isCheckpointed %d\n", dev->isCheckpointed));
+               (TSTR("yaffs_read_super: isCheckpointed %d\n"),
+               dev->isCheckpointed));

 
 

-       T(YAFFS_TRACE_OS, ("yaffs_read_super: done\n"));
+       T(YAFFS_TRACE_OS, (TSTR("yaffs_read_super: done\n")));

        return sb;
 }
 
        return sb;
 }
 


@@ -2947,9 +2949,7 @@ static int yaffs_proc_read(char *page,
 
        /* Print header first */
        if (step == 0)
 
        /* Print header first */
        if (step == 0)

-               buf += sprintf(buf, "YAFFS built:" __DATE__ " " __TIME__
-                              "\n%s\n%s\n", yaffs_fs_c_version,
-                              yaffs_guts_c_version);
+               buf += sprintf(buf, "YAFFS built:" __DATE__ " " __TIME__"\n");

        else if (step == 1)
                buf += sprintf(buf,"\n");
        else {
        else if (step == 1)
                buf += sprintf(buf,"\n");
        else {


@@ -2980,7 +2980,7 @@ static int yaffs_proc_read(char *page,
        return buf - page < count ? buf - page : count;
 }
 
        return buf - page < count ? buf - page : count;
 }
 

-static int yaffs_debug_proc_read(char *page,
+static int yaffs_stats_proc_read(char *page,

                                char **start,
                                off_t offset, int count, int *eof, void *data)
 {
                                char **start,
                                off_t offset, int count, int *eof, void *data)
 {


@@ -3027,6 +3027,7 @@ static struct {
 } mask_flags[] = {
        {"allocate", YAFFS_TRACE_ALLOCATE},
        {"always", YAFFS_TRACE_ALWAYS},
 } mask_flags[] = {
        {"allocate", YAFFS_TRACE_ALLOCATE},
        {"always", YAFFS_TRACE_ALWAYS},

+       {"background", YAFFS_TRACE_BACKGROUND},

        {"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
        {"buffers", YAFFS_TRACE_BUFFERS},
        {"bug", YAFFS_TRACE_BUG},
        {"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
        {"buffers", YAFFS_TRACE_BUFFERS},
        {"bug", YAFFS_TRACE_BUG},


@@ -3036,6 +3037,7 @@ static struct {
        {"error", YAFFS_TRACE_ERROR},
        {"gc_detail", YAFFS_TRACE_GC_DETAIL},
        {"gc", YAFFS_TRACE_GC},
        {"error", YAFFS_TRACE_ERROR},
        {"gc_detail", YAFFS_TRACE_GC_DETAIL},
        {"gc", YAFFS_TRACE_GC},

+       {"lock", YAFFS_TRACE_LOCK},

        {"mtd", YAFFS_TRACE_MTD},
        {"nandaccess", YAFFS_TRACE_NANDACCESS},
        {"os", YAFFS_TRACE_OS},
        {"mtd", YAFFS_TRACE_MTD},
        {"nandaccess", YAFFS_TRACE_NANDACCESS},
        {"os", YAFFS_TRACE_OS},


@@ -3043,15 +3045,13 @@ static struct {
        {"scan", YAFFS_TRACE_SCAN},
        {"tracing", YAFFS_TRACE_TRACING},
        {"sync", YAFFS_TRACE_SYNC},
        {"scan", YAFFS_TRACE_SCAN},
        {"tracing", YAFFS_TRACE_TRACING},
        {"sync", YAFFS_TRACE_SYNC},

-
-       {"background", YAFFS_TRACE_BACKGROUND},
+       {"write", YAFFS_TRACE_WRITE},

 
        {"verify", YAFFS_TRACE_VERIFY},
        {"verify_nand", YAFFS_TRACE_VERIFY_NAND},
        {"verify_full", YAFFS_TRACE_VERIFY_FULL},
        {"verify_all", YAFFS_TRACE_VERIFY_ALL},
 
 
        {"verify", YAFFS_TRACE_VERIFY},
        {"verify_nand", YAFFS_TRACE_VERIFY_NAND},
        {"verify_full", YAFFS_TRACE_VERIFY_FULL},
        {"verify_all", YAFFS_TRACE_VERIFY_ALL},
 

-       {"write", YAFFS_TRACE_WRITE},

        {"all", 0xffffffff},
        {"none", 0},
        {NULL, 0},
        {"all", 0xffffffff},
        {"none", 0},
        {NULL, 0},


@@ -3142,7 +3142,8 @@ static int yaffs_proc_write_trace_options(struct file *file, const char *buf,
        if (rg & YAFFS_TRACE_ALWAYS) {
                for (i = 0; mask_flags[i].mask_name != NULL; i++) {
                        char flag;
        if (rg & YAFFS_TRACE_ALWAYS) {
                for (i = 0; mask_flags[i].mask_name != NULL; i++) {
                        char flag;

-                       flag = ((rg & mask_flags[i].mask_bitfield) == mask_flags[i].mask_bitfield) ? '+' : '-';
+                       flag = ((rg & mask_flags[i].mask_bitfield) ==
+                               mask_flags[i].mask_bitfield) ? '+' : '-';

                        printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
                }
        }
                        printk(KERN_DEBUG "%c%s\n", flag, mask_flags[i].mask_name);
                }
        }


@@ -3175,7 +3176,7 @@ static int __init init_yaffs_fs(void)
        struct file_system_to_install *fsinst;
 
        T(YAFFS_TRACE_ALWAYS,
        struct file_system_to_install *fsinst;
 
        T(YAFFS_TRACE_ALWAYS,

-         ("yaffs " __DATE__ " " __TIME__ " Installing. \n"));
+         (TSTR("yaffs built " __DATE__ " " __TIME__ " Installing. \n")));

 
        init_MUTEX(&yaffs_context_lock);
 
 
        init_MUTEX(&yaffs_context_lock);
 


@@ -3191,13 +3192,13 @@ static int __init init_yaffs_fs(void)
        } else
                return -ENOMEM;
 
        } else
                return -ENOMEM;
 

-       debug_proc_entry = create_proc_entry("yaffs_debug",
+       debug_proc_entry = create_proc_entry("yaffs_stats",

                                               S_IRUGO | S_IFREG,
                                               YPROC_ROOT);
 
        if (debug_proc_entry) {
                debug_proc_entry->write_proc = NULL;
                                               S_IRUGO | S_IFREG,
                                               YPROC_ROOT);
 
        if (debug_proc_entry) {
                debug_proc_entry->write_proc = NULL;

-               debug_proc_entry->read_proc = yaffs_debug_proc_read;
+               debug_proc_entry->read_proc = yaffs_stats_proc_read;

                debug_proc_entry->data = NULL;
        } else
                return -ENOMEM;
                debug_proc_entry->data = NULL;
        } else
                return -ENOMEM;


@@ -3234,11 +3235,11 @@ static void __exit exit_yaffs_fs(void)
 
        struct file_system_to_install *fsinst;
 
 
        struct file_system_to_install *fsinst;
 

-       T(YAFFS_TRACE_ALWAYS, ("yaffs " __DATE__ " " __TIME__
-                              " removing. \n"));
+       T(YAFFS_TRACE_ALWAYS,
+               (TSTR("yaffs built " __DATE__ " " __TIME__ " removing. \n")));

 
        remove_proc_entry("yaffs", YPROC_ROOT);
 
        remove_proc_entry("yaffs", YPROC_ROOT);

-       remove_proc_entry("yaffs_debug", YPROC_ROOT);
+       remove_proc_entry("yaffs_stats", YPROC_ROOT);

 
        fsinst = fs_to_install;
 
 
        fsinst = fs_to_install;
 


@@ -3255,5 +3256,5 @@ module_init(init_yaffs_fs)
 module_exit(exit_yaffs_fs)
 
 MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
 module_exit(exit_yaffs_fs)
 
 MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");

-MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2006");
+MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2010");

 MODULE_LICENSE("GPL");
 MODULE_LICENSE("GPL");

diff --git a/yaffs_getblockinfo.h b/yaffs_getblockinfo.h
index c8ff77798ea57956d9f74c50d59ecd656431ef42..71fe1deea3c602c64ad78f4f6283decfbf1ae228 100644 (file)
--- a/yaffs_getblockinfo.h
+++ b/yaffs_getblockinfo.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 087ac958f61f127a9c9d8c99a89d1b5e71d70fb5..d77ee4745d79e29d1e18ceeafc57a2b591c38a66 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -10,10 +10,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */

-
-const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.120 2010-03-15 23:10:34 charles Exp $";
-

 #include "yportenv.h"
 #include "yaffs_trace.h"
 
 #include "yportenv.h"
 #include "yaffs_trace.h"
 

diff --git a/yaffs_guts.h b/yaffs_guts.h
index da41904bdf3d55355eeb57ba3345052c4a7873f8..3647d6bce6cd629dfcc483edead75c5519809a17 100644 (file)
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_linux.h b/yaffs_linux.h
index f18c697c180320d3dc402708b964f0fb6e59912c..4434e6c497b93598feacdcb91f139de3577e34c9 100644 (file)
--- a/yaffs_linux.h
+++ b/yaffs_linux.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 4fc765ce38a467550487a998b432582a0388a80c..5de3193ea2b9bba34e104760a4ec23027d3487bf 100644 (file)
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -11,9 +11,6 @@
  * published by the Free Software Foundation.
  */
 
  * published by the Free Software Foundation.
  */
 

-const char *yaffs_mtdif_c_version =
-       "$Id: yaffs_mtdif.c,v 1.25 2010-02-19 01:06:31 charles Exp $";
-

 #include "yportenv.h"
 
 
 #include "yportenv.h"
 
 

diff --git a/yaffs_mtdif.h b/yaffs_mtdif.h
index bf7e21a617535bf669a8fa85f00247db132ae021..fad9d287061c2f458445869c260f4cf35700c573 100644 (file)
--- a/yaffs_mtdif.h
+++ b/yaffs_mtdif.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_mtdif1.c b/yaffs_mtdif1.c
index 16171e09ba7b9aa9cdf5a9674fea5d279267737d..aaa02db2f66592cd82d69aa13d8bd3c3e07cf6ab 100644 (file)
--- a/yaffs_mtdif1.c
+++ b/yaffs_mtdif1.c
@@ -2,7 +2,7 @@
  * YAFFS: Yet another FFS. A NAND-flash specific file system.
  * yaffs_mtdif1.c  NAND mtd interface functions for small-page NAND.
  *
  * YAFFS: Yet another FFS. A NAND-flash specific file system.
  * yaffs_mtdif1.c  NAND mtd interface functions for small-page NAND.
  *

- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * This program is free software; you can redistribute it and/or modify
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * This program is free software; you can redistribute it and/or modify


@@ -38,8 +38,6 @@
 /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
 #if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
 
 /* Don't compile this module if we don't have MTD's mtd_oob_ops interface */
 #if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
 

-const char *yaffs_mtdif1_c_version = "$Id: yaffs_mtdif1.c,v 1.13 2010-02-18 01:18:04 charles Exp $";
-

 #ifndef CONFIG_YAFFS_9BYTE_TAGS
 # define YTAG1_SIZE 8
 #else
 #ifndef CONFIG_YAFFS_9BYTE_TAGS
 # define YTAG1_SIZE 8
 #else


@@ -137,9 +135,9 @@ int nandmtd1_WriteChunkWithTagsToNAND(yaffs_Device *dev,
 
        retval = mtd->write_oob(mtd, addr, &ops);
        if (retval) {
 
        retval = mtd->write_oob(mtd, addr, &ops);
        if (retval) {

-               yaffs_trace(YAFFS_TRACE_MTD,
-                       "write_oob failed, chunk %d, mtd error %d\n",
-                       chunkInNAND, retval);
+               T(YAFFS_TRACE_MTD,
+                       (TSTR("write_oob failed, chunk %d, mtd error %d"TENDSTR),
+                       chunkInNAND, retval));

        }
        return retval ? YAFFS_FAIL : YAFFS_OK;
 }
        }
        return retval ? YAFFS_FAIL : YAFFS_OK;
 }


@@ -198,9 +196,9 @@ int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
         */
        retval = mtd->read_oob(mtd, addr, &ops);
        if (retval) {
         */
        retval = mtd->read_oob(mtd, addr, &ops);
        if (retval) {

-               yaffs_trace(YAFFS_TRACE_MTD,
-                       "read_oob failed, chunk %d, mtd error %d\n",
-                       chunkInNAND, retval);
+               T(YAFFS_TRACE_MTD,
+                       (TSTR("read_oob failed, chunk %d, mtd error %d"TENDSTR),
+                       chunkInNAND, retval));

        }
 
        switch (retval) {
        }
 
        switch (retval) {


@@ -286,7 +284,7 @@ int nandmtd1_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
        int blocksize = dev->param.nChunksPerBlock * dev->nDataBytesPerChunk;
        int retval;
 
        int blocksize = dev->param.nChunksPerBlock * dev->nDataBytesPerChunk;
        int retval;
 

-       yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad\n", blockNo);
+       T(YAFFS_TRACE_BAD_BLOCKS,(TSTR("marking block %d bad"TENDSTR), blockNo));

 
        retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
        return (retval) ? YAFFS_FAIL : YAFFS_OK;
 
        retval = mtd->block_markbad(mtd, (loff_t)blocksize * blockNo);
        return (retval) ? YAFFS_FAIL : YAFFS_OK;


@@ -303,9 +301,9 @@ static int nandmtd1_TestPrerequists(struct mtd_info *mtd)
        int oobavail = mtd->ecclayout->oobavail;
 
        if (oobavail < YTAG1_SIZE) {
        int oobavail = mtd->ecclayout->oobavail;
 
        if (oobavail < YTAG1_SIZE) {

-               yaffs_trace(YAFFS_TRACE_ERROR,
-                       "mtd device has only %d bytes for tags, need %d\n",
-                       oobavail, YTAG1_SIZE);
+               T(YAFFS_TRACE_ERROR,
+                       (TSTR("mtd device has only %d bytes for tags, need %d"TENDSTR),
+                       oobavail, YTAG1_SIZE));

                return YAFFS_FAIL;
        }
        return YAFFS_OK;
                return YAFFS_FAIL;
        }
        return YAFFS_OK;


@@ -340,8 +338,8 @@ int nandmtd1_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
        retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
        etags.blockBad = (mtd->block_isbad)(mtd, addr);
        if (etags.blockBad) {
        retval = nandmtd1_ReadChunkWithTagsFromNAND(dev, chunkNo, NULL, &etags);
        etags.blockBad = (mtd->block_isbad)(mtd, addr);
        if (etags.blockBad) {

-               yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
-                       "block %d is marked bad\n", blockNo);
+               T(YAFFS_TRACE_BAD_BLOCKS,
+                       (TSTR("block %d is marked bad"TENDSTR), blockNo));

                state = YAFFS_BLOCK_STATE_DEAD;
        } else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
                /* bad tags, need to look more closely */
                state = YAFFS_BLOCK_STATE_DEAD;
        } else if (etags.eccResult != YAFFS_ECC_RESULT_NO_ERROR) {
                /* bad tags, need to look more closely */

diff --git a/yaffs_mtdif1.h b/yaffs_mtdif1.h
index 240202cdf7f1837e4dbaa1f6f8950c1c105ca582..0e6a56fbd540eac769f19c47c7acb5081a9fbfe0 100644 (file)
--- a/yaffs_mtdif1.h
+++ b/yaffs_mtdif1.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * This program is free software; you can redistribute it and/or modify
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c
index 8cbe19f37b2500d3bea737a1c182b600e2abb4e6..2b5884715a0f9e6a218fd5a7ebc5a901d5e26d86 100644 (file)
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtdif2.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -13,9 +13,6 @@
 
 /* mtd interface for YAFFS2 */
 
 
 /* mtd interface for YAFFS2 */
 

-const char *yaffs_mtdif2_c_version =
-       "$Id: yaffs_mtdif2.c,v 1.27 2010-02-18 01:18:04 charles Exp $";
-

 #include "yportenv.h"
 #include "yaffs_trace.h"
 
 #include "yportenv.h"
 #include "yaffs_trace.h"
 

diff --git a/yaffs_mtdif2.h b/yaffs_mtdif2.h
index b5ff07881ff72b23bc993c870018aa7b747855d0..5691267eafa88ae5fad30bded14ed995fcfa9b69 100644 (file)
--- a/yaffs_mtdif2.h
+++ b/yaffs_mtdif2.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 883a4a788079a6dc8c6b47c2494a2b690e64ef79..cb2a1629f2008e65a7efc176edc918cb712f14b5 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -11,9 +11,6 @@
  * published by the Free Software Foundation.
  */
 
  * published by the Free Software Foundation.
  */
 

-const char *yaffs_nand_c_version =
-       "$Id: yaffs_nand.c,v 1.13 2010-02-19 01:05:48 charles Exp $";
-

 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
 #include "yaffs_tagsvalidity.h"
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
 #include "yaffs_tagsvalidity.h"

diff --git a/yaffs_nand.h b/yaffs_nand.h
index e013cdc2f545822f9c873267d86ad599627446e3..62a466596c5995043e12b9d98d5ce375898d1ab5 100644 (file)
--- a/yaffs_nand.h
+++ b/yaffs_nand.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_nandemul2k.h b/yaffs_nandemul2k.h
index 41bc2b5f8b47a52e0c571008674eeb4c30c6b8bf..2f4ce97b22bf3d5263373f288cceaa39d49e384a 100644 (file)
--- a/yaffs_nandemul2k.h
+++ b/yaffs_nandemul2k.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_packedtags1.c b/yaffs_packedtags1.c
index 3e67e69166663feeb76871b6307b01bf80e9773f..b2160c08b60f5ba84b53e8bccd2baa67a9e9e0ba 100644 (file)
--- a/yaffs_packedtags1.c
+++ b/yaffs_packedtags1.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_packedtags1.h b/yaffs_packedtags1.h
index f8c0471d4a4605f60ad7e8b463bd565406ddd1f6..b9cf1a8bfbc1d19237596131bf1bdfd1a7859c77 100644 (file)
--- a/yaffs_packedtags1.h
+++ b/yaffs_packedtags1.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_packedtags2.c b/yaffs_packedtags2.c
index c6f7dcf3365035368a7c9b077ed0ede7ebb5a2db..f8ae94ccddb479854f8398e6f8fc3949979180c1 100644 (file)
--- a/yaffs_packedtags2.c
+++ b/yaffs_packedtags2.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_packedtags2.h b/yaffs_packedtags2.h
index 941e8afc6aeace22622e875b37140d3543ba39c1..c132a98cdc2043bbad5133e38dbcf4887e9318b5 100644 (file)
--- a/yaffs_packedtags2.h
+++ b/yaffs_packedtags2.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_qsort.h b/yaffs_qsort.h
index 941c7a87ca0fd4a22574c6638ae1472193c55f37..a24d58e375831a4c079638b189e6d016a1f01ead 100644 (file)
--- a/yaffs_qsort.h
+++ b/yaffs_qsort.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_tagscompat.c b/yaffs_tagscompat.c
index 1ab054faf61743f8e99e600f83ce78a3f5168a57..e9ac51d7f94bb0127b681392d116fcb4311c705a 100644 (file)
--- a/yaffs_tagscompat.c
+++ b/yaffs_tagscompat.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_tagscompat.h b/yaffs_tagscompat.h
index 6f95119e0aabd2dc0795521e754135b0cf218372..8c663db526cfa2181ef0edfa5db8dad1d0d3ac46 100644 (file)
--- a/yaffs_tagscompat.h
+++ b/yaffs_tagscompat.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_tagsvalidity.c b/yaffs_tagsvalidity.c
index 5233bcba8b3bb3dddff5425d29ecac1edc1be67f..93ad08c1f5deda3f00b0bbc17aaafde49ba6b0f6 100644 (file)
--- a/yaffs_tagsvalidity.c
+++ b/yaffs_tagsvalidity.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_tagsvalidity.h b/yaffs_tagsvalidity.h
index cb11884b2d18725f7ccf6665b30706376e339f14..60a1aea6c5c75ed7148d3fea7f0669950bb1ae65 100644 (file)
--- a/yaffs_tagsvalidity.h
+++ b/yaffs_tagsvalidity.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yaffs_trace.h b/yaffs_trace.h
index 68a2ffc9dbc8efcba86902113ac18903d7b687ec..8b848edba05ef913c85131b936bc564917a6d9d7 100644 (file)
--- a/yaffs_trace.h
+++ b/yaffs_trace.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -47,8 +47,8 @@ extern unsigned int yaffs_wr_attempts;
 #define YAFFS_TRACE_VERIFY_ALL         0x000F0000
 
 #define YAFFS_TRACE_SYNC               0x00100000
 #define YAFFS_TRACE_VERIFY_ALL         0x000F0000
 
 #define YAFFS_TRACE_SYNC               0x00100000

-

 #define YAFFS_TRACE_BACKGROUND         0x00200000
 #define YAFFS_TRACE_BACKGROUND         0x00200000

+#define YAFFS_TRACE_LOCK               0x00400000

 
 #define YAFFS_TRACE_ERROR              0x40000000
 #define YAFFS_TRACE_BUG                        0x80000000
 
 #define YAFFS_TRACE_ERROR              0x40000000
 #define YAFFS_TRACE_BUG                        0x80000000

diff --git a/yaffsinterface.h b/yaffsinterface.h
index 810837a32d9bb3285a62abbd674ad1e36f65f4e1..ca36cfc427a23f6a8d3cd491aeb74355096cf736 100644 (file)
--- a/yaffsinterface.h
+++ b/yaffsinterface.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>

diff --git a/yportenv.h b/yportenv.h
index e1f61f49fab59c2b85e64f49b65ebd0f7fbc36a3..7a8397f0f0683a71f5678265b05d6807971ea20c 100644 (file)
--- a/yportenv.h
+++ b/yportenv.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *

- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -89,15 +89,10 @@
 #define yaffs_strcmp(a, b) strcmp(a, b)
 
 #define TENDSTR "\n"
 #define yaffs_strcmp(a, b) strcmp(a, b)
 
 #define TENDSTR "\n"

-#define TSTR(x) KERN_WARNING x
+#define TSTR(x) KERN_DEBUG x

 #define TCONT(x) x
 #define TOUT(p) printk p
 
 #define TCONT(x) x
 #define TOUT(p) printk p
 

-#define yaffs_trace(mask, fmt, args...) \
-       do { if ((mask) & (yaffs_traceMask| YAFFS_TRACE_ALWAYS)) \
-               printk(KERN_WARNING "yaffs: " fmt, ## args); \
-       } while (0)
-

 #define compile_time_assertion(assertion) \
        ({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; })
 
 #define compile_time_assertion(assertion) \
        ({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; })