X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.c;h=6658918cc8906dd08bcd432efcfcd41a2bd155a0;hp=d4349c92ad2342c151f9f9755791b5751aae0bb9;hb=fb246b6eb57f7a7bd318d12b0562ee8708404f25;hpb=d7768d28faa5ffd97035349bda0c75a46686256c

diff --git a/yaffs_guts.c b/yaffs_guts.c
index d4349c9..6658918 100644
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -12,9 +12,10 @@
  */
 
 const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.104 2010-01-05 22:58:15 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.106 2010-01-11 04:06:46 charles Exp $";
 
 #include "yportenv.h"
+#include "yaffs_trace.h"
 
 #include "yaffsinterface.h"
 #include "yaffs_guts.h"
@@ -2050,9 +2051,7 @@ static void yaffs_FreeObject(yaffs_Object *tn)
 {
 	yaffs_Device *dev = tn->myDev;
 
-#ifdef __KERNEL__
 	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
-#endif
 
 	if (tn->parent)
 		YBUG();
@@ -2060,7 +2059,6 @@ static void yaffs_FreeObject(yaffs_Object *tn)
 		YBUG();
 
 
-#ifdef __KERNEL__
 	if (tn->myInode) {
 		/* We're still hooked up to a cached inode.
 		 * Don't delete now, but mark for later deletion
@@ -2068,7 +2066,6 @@ static void yaffs_FreeObject(yaffs_Object *tn)
 		tn->deferedFree = 1;
 		return;
 	}
-#endif
 
 	yaffs_UnhashObject(tn);
 
@@ -5254,13 +5251,8 @@ static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
 	int retVal;
 	int immediateDeletion = 0;
 
-#ifdef __KERNEL__
 	if (!in->myInode)
 		immediateDeletion = 1;
-#else
-	if (in->inUse <= 0)
-		immediateDeletion = 1;
-#endif
 
 	if (immediateDeletion) {
 		retVal =
@@ -5380,13 +5372,8 @@ static int yaffs_UnlinkWorker(yaffs_Object *obj)
 
 	int immediateDeletion = 0;
 
-#ifdef __KERNEL__
 	if (!obj->myInode)
 		immediateDeletion = 1;
-#else
-	if (obj->inUse <= 0)
-		immediateDeletion = 1;
-#endif
 
 	if(obj)
 		yaffs_UpdateParent(obj->parent);