Mercurial > yaffs-ecoscentric-gpl

changeset 333:a8edea4667fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix pruning to work correctly with wide Tnodes
author charles <charles>
date Fri, 25 Dec 2009 01:53:05 +0000
parents 56d04ee60d06
children 162769b7fc23
files yaffs_guts.c
diffstat 1 files changed, 27 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.100 2009-12-22 04:09:06 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.101 2009-12-25 01:53:05 charles Exp $";
 
 #include "yportenv.h"
 
@@ -1818,17 +1818,32 @@ static yaffs_Tnode *yaffs_PruneWorker(ya
 	if (tn) {
 		hasData = 0;
 
-		for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
-			if (tn->internal[i] && level > 0) {
-				tn->internal[i] =
-				    yaffs_PruneWorker(dev, tn->internal[i],
-						      level - 1,
-						      (i == 0) ? del0 : 1);
-			}
-
-			if (tn->internal[i])
-				hasData++;
-		}
+		if(level > 0){
+        		for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
+	        		if (tn->internal[i]) {
+		        		tn->internal[i] =
+		        		        yaffs_PruneWorker(dev, tn->internal[i],
+						        level - 1,
+						        (i == 0) ? del0 : 1);
+        			}
+
+	        		if (tn->internal[i])
+		        		hasData++;
+                        }
+		} else {
+		        int tnodeSize;
+		        __u32 *map = (__u32 *)tn;
+                	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
+
+                	if (tnodeSize < sizeof(yaffs_Tnode))
+                	        tnodeSize = sizeof(yaffs_Tnode);
+                        tnodeSize /= sizeof(__u32);
+
+                        for(i = 0; !hasData && i < tnodeSize; i++){
+                                if(map[i])
+                                        hasData++;
+                        }
+                }
 
 		if (hasData == 0 && del0) {
 			/* Free and return NULL */