diff --git a/src/sys/ubixfs/dirCache.c b/src/sys/ubixfs/dirCache.c index c76933e..8eeec0c 100644 --- a/src/sys/ubixfs/dirCache.c +++ b/src/sys/ubixfs/dirCache.c @@ -130,7 +130,6 @@ * we found the node. Move it to the front of the list * (if it isn't already) */ -#if 0 assert(tmp->parent); if (tmp != tmp->parent->fileListHead) { @@ -146,7 +145,7 @@ tmp->prev = NULL; tmp->parent->fileListHead = tmp; } /* if */ -#endif + return tmp; } /* if */ tmp = tmp->next; @@ -250,6 +249,9 @@ /*** $Log$ + Revision 1.25 2004/07/27 19:24:31 flameshadow + chg: reduced the number of debugging statements in the kernel. + Revision 1.24 2004/07/27 12:02:01 reddawg chg: fixed marks bug readFile did a lookup which is why it looked like it was loopping so much @@ -306,6 +308,9 @@ Revision 1.5 2004/07/20 19:21:30 reddawg You like leaving out $Log$ + You like leaving out Revision 1.25 2004/07/27 19:24:31 flameshadow + You like leaving out chg: reduced the number of debugging statements in the kernel. + You like leaving out You like leaving out Revision 1.24 2004/07/27 12:02:01 reddawg You like leaving out chg: fixed marks bug readFile did a lookup which is why it looked like it was loopping so much You like leaving out diff --git a/src/sys/ubixfs/ubixfs.c b/src/sys/ubixfs/ubixfs.c index 5e9650c..6cc3435 100644 --- a/src/sys/ubixfs/ubixfs.c +++ b/src/sys/ubixfs/ubixfs.c @@ -61,22 +61,16 @@ assert(fsInfo); assert(fsInfo->dirCache); - /* - UBU - - I did not like the order in which things happened here so let me fix it :) - - */ - do { cacheNode = ubixfs_cacheFind(fsInfo->dirCache, file); if (cacheNode == NULL) return 0; if (cacheNode->present == 1) break; +assert(cacheNode->size); if (*cacheNode->size != 0 && cacheNode->info == NULL) { kprintf("caching name(size): %s(%d)\n", cacheNode->name, *cacheNode->size); cacheNode->info = kmalloc(UBIXFS_ALIGN(*cacheNode->size)); fd->size = *cacheNode->size; - +assert(cacheNode->startCluster); ubixfs_loadData(fd, cacheNode->info, *cacheNode->size, @@ -531,6 +525,9 @@ /*** $Log$ + Revision 1.39 2004/07/27 19:24:31 flameshadow + chg: reduced the number of debugging statements in the kernel. + Revision 1.38 2004/07/27 12:02:01 reddawg chg: fixed marks bug readFile did a lookup which is why it looked like it was loopping so much