X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fnodecache.c;h=d2796c1b9d3420d5edb737d739bcee72867a0f63;hb=5f2024e5977e0cca0993a20dad5ab794c94d5711;hp=983f3f776a8ee4b847106892512c37303dfbbd23;hpb=8bc40333b1401d7616b225945fee53d972c2f418;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/nodecache.c b/Kernel/vfs/nodecache.c
index 983f3f77..d2796c1b 100644
--- a/Kernel/vfs/nodecache.c
+++ b/Kernel/vfs/nodecache.c
@@ -2,7 +2,7 @@
  * AcessMicro VFS
  * - File IO Passthru's
  */
-#include <common.h>
+#include <acess.h>
 #include "vfs.h"
 #include "vfs_int.h"
 
@@ -23,7 +23,7 @@ tInodeCache	*Inode_int_GetFSCache(int Handle);
 
 // === GLOBALS ===
  int	gVFS_NextInodeHandle = 1;
- int	gilVFS_InodeCache = 0;
+tShortSpinlock	glVFS_InodeCache;
 tInodeCache	*gVFS_InodeCache = NULL;
 
 // === CODE ===
@@ -40,10 +40,10 @@ int Inode_GetHandle()
 	ent->Next = NULL;	ent->FirstNode = NULL;
 	
 	// Add to list
-	LOCK( &gilVFS_InodeCache );
+	SHORTLOCK( &glVFS_InodeCache );
 	ent->Next = gVFS_InodeCache;
 	gVFS_InodeCache = ent;
-	RELEASE( &gilVFS_InodeCache );
+	SHORTREL( &glVFS_InodeCache );
 	
 	return gVFS_NextInodeHandle-1;
 }
@@ -121,9 +121,9 @@ void Inode_UncacheNode(int Handle, Uint64 Inode)
 	tCachedInode	*ent, *prev;
 	
 	cache = Inode_int_GetFSCache(Handle);
-	if(!cache)	return;
+	if(!cache)	return ;
 	
-	if(Inode > cache->MaxCached)	return;
+	if(Inode > cache->MaxCached)	return ;
 	
 	// Search Cache
 	ent = cache->FirstNode;
@@ -147,8 +147,10 @@ void Inode_UncacheNode(int Handle, Uint64 Inode)
 				
 			free(ent);
 		}
-		return;
+		return ;
 	}
+	
+	return ;
 }
 
 /**
@@ -158,11 +160,16 @@ void Inode_UncacheNode(int Handle, Uint64 Inode)
 void Inode_ClearCache(int Handle)
 {
 	tInodeCache	*cache;
-	tInodeCache	*prev = (tInodeCache*) &gVFS_InodeCache;
+	tInodeCache	*prev = NULL;
 	tCachedInode	*ent, *next;
 	
-	cache = Inode_int_GetFSCache(Handle);
-	if(!cache)	return;
+	// Find the cache
+	for(
+		cache = gVFS_InodeCache;
+		cache && cache->Handle < Handle;
+		prev = cache, cache = cache->Next
+		);
+	if(!cache || cache->Handle != Handle)	return;
 	
 	// Search Cache
 	ent = cache->FirstNode;
@@ -171,15 +178,18 @@ void Inode_ClearCache(int Handle)
 		ent->Node.ReferenceCount = 1;
 		next = ent->Next;
 		
-		if(ent->Node.Close)
-			ent->Node.Close( &ent->Node );
+		if(ent->Node.Type && ent->Node.Type->Close)
+			ent->Node.Type->Close( &ent->Node );
 		free(ent);
 		
 		ent = next;
 	}
 	
 	// Free Cache
-	prev->Next = cache->Next;
+	if(prev == NULL)
+		gVFS_InodeCache = cache->Next;
+	else
+		prev->Next = cache->Next;
 	free(cache);
 }