yaffs Normalized headers for release branch.

[yaffs2.git] / yaffs_allocator.c

diff --git a/yaffs_allocator.c b/yaffs_allocator.c
index 3807fc91e5e109d503c239cb4c52ba3ad3bc420c..a284439cfa62e070b959cd65d49f3a6a385c93ba 100644 (file)
--- a/yaffs_allocator.c
+++ b/yaffs_allocator.c
@@ -1,5 +1,5 @@
 /*
- * 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-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
@@ -7,13 +7,12 @@
  * 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 Lesser General Public License version 2.1 as
+ * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  */
 
 
+
 #include "yaffs_allocator.h"
 #include "yaffs_guts.h"
 #include "yaffs_trace.h"
@@ -168,21 +167,6 @@ static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
                return YAFFS_FAIL;
        }
 
-       /* Hook them into the free list */
-#if 0
-       for (i = 0; i < nTnodes - 1; i++) {
-               newTnodes[i].internal[0] = &newTnodes[i + 1];
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-               newTnodes[i].internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-       }
-
-       newTnodes[nTnodes - 1].internal[0] = allocator->freeTnodes;
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-       newTnodes[nTnodes - 1].internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-       allocator->freeTnodes = newTnodes;
-#else
        /* New hookup for wide tnodes */
        for (i = 0; i < nTnodes - 1; i++) {
                curr = (yaffs_Tnode *) &mem[i * dev->tnodeSize];
@@ -194,9 +178,6 @@ static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
        curr->internal[0] = allocator->freeTnodes;
        allocator->freeTnodes = (yaffs_Tnode *)mem;
 
-#endif
-
-
        allocator->nFreeTnodes += nTnodes;
        allocator->nTnodesCreated += nTnodes;
 
@@ -239,13 +220,6 @@ yaffs_Tnode *yaffs_AllocateRawTnode(yaffs_Device *dev)
 
        if (allocator->freeTnodes) {
                tn = allocator->freeTnodes;
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-               if (tn->internal[YAFFS_NTNODES_INTERNAL] != (void *)1) {
-                       /* Hoosterman, this thing looks like it isn't in the list */
-                       T(YAFFS_TRACE_ALWAYS,
-                         (TSTR("yaffs: Tnode list bug 1" TENDSTR)));
-               }
-#endif
                allocator->freeTnodes = allocator->freeTnodes->internal[0];
                allocator->nFreeTnodes--;
        }
@@ -264,14 +238,6 @@ void yaffs_FreeRawTnode(yaffs_Device *dev, yaffs_Tnode *tn)
        }
 
        if (tn) {
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-               if (tn->internal[YAFFS_NTNODES_INTERNAL] != 0) {
-                       /* Hoosterman, this thing looks like it is already in the list */
-                       T(YAFFS_TRACE_ALWAYS,
-                         (TSTR("yaffs: Tnode list bug 2" TENDSTR)));
-               }
-               tn->internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
                tn->internal[0] = allocator->freeTnodes;
                allocator->freeTnodes = tn;
                allocator->nFreeTnodes++;