Change direct handle management to use an inode layer to make it consistent with...

[yaffs2.git] / yaffs_guts.c

diff --git a/yaffs_guts.c b/yaffs_guts.c
index d3539a019d52a8cea9f2fc073665a55cb395f6c7..f9819f0428b578cb532d3a7a48ebdf9c44d44273 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.102 2009-12-30 22:30:12 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.105 2010-01-06 04:02:12 charles Exp $";
 
 #include "yportenv.h"
 
@@ -1351,6 +1351,7 @@ static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
 
        dev->freeTnodes = NULL;
        dev->nFreeTnodes = 0;
+       dev->nTnodesCreated = 0;
 }
 
 static void yaffs_InitialiseTnodes(yaffs_Device *dev)
@@ -2049,9 +2050,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();
@@ -2059,7 +2058,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
@@ -2067,7 +2065,6 @@ static void yaffs_FreeObject(yaffs_Object *tn)
                tn->deferedFree = 1;
                return;
        }
-#endif
 
        yaffs_UnhashObject(tn);
 
@@ -2109,6 +2106,7 @@ static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
 
        dev->freeObjects = NULL;
        dev->nFreeObjects = 0;
+       dev->nObjectsCreated = 0;
 }
 
 static void yaffs_InitialiseObjects(yaffs_Device *dev)
@@ -5252,13 +5250,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 =
@@ -5378,13 +5371,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);
@@ -5401,23 +5389,26 @@ static int yaffs_UnlinkWorker(yaffs_Object *obj)
                 * Instead, we do the following:
                 * - Select a hardlink.
                 * - Unhook it from the hard links
-                * - Unhook it from its parent directory (so that the rename can work)
+                * - Move it from its parent directory (so that the rename can work)
                 * - Rename the object to the hardlink's name.
                 * - Delete the hardlink
                 */
 
                yaffs_Object *hl;
+               yaffs_Object *parent;
                int retVal;
                YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
 
                hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
 
+               yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
+               parent = hl->parent;
+
                ylist_del_init(&hl->hardLinks);
-               ylist_del_init(&hl->siblings);
 
-               yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
+               yaffs_AddObjectToDirectory(obj->myDev->unlinkedDir, hl);
 
-               retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
+               retVal = yaffs_ChangeObjectName(obj,parent, name, 0, 0);
 
                if (retVal == YAFFS_OK)
                        retVal = yaffs_DoGenericObjectDeletion(hl);