Changeset 1096 for Whitix

Timestamp:

10/07/08 16:28:15 (2 months ago)

Author:

mwhitworth

Message:

Add FatFsToSector call when allocating first sector, clean up comments and misc formatting fixes.

Location:

Whitix/branches/keobject/fs/fat

Files:

• dir.c (modified) (2 diffs)
• fat.c (modified) (6 diffs)
• file.c (modified) (5 diffs)
• vnode.c (modified) (9 diffs)

Whitix/branches/keobject/fs/fat/dir.c

@@ -167 +167 @@
          */
 
-//      printf("%s, nameLen = %d, base len = %d, extension len = %d\n",name,nameLength,FatBaseNameLen(name,nameLength),FatExtensionLen(name,nameLength));
+//      KePrint("%s, nameLen = %d, base len = %d, extension len = %d\n",name,nameLength,FatBaseNameLen(name,nameLength),FatExtensionLen(name,nameLength));
 
         if (!FatIsLong(name,nameLength))
@@ -224 +224 @@
                 }
         }
-
+        
         return -ENOENT;
 }

Whitix/branches/keobject/fs/fat/fat.c

@@ -56 +56 @@
         }
 
-        /* Due to the lovely FAT12 format, where entries can strech over blocks, 2 blocks have to be read in in the worst
-           case scenario */
+        /* Due to the lovely FAT12 format, where entries can strech over blocks, 
+         * 2 blocks have to be read in in the worst case scenario */
 
         /* Get the index number into the FAT */
@@ -100 +100 @@
                         retVal=(*pFirst+(*pLast << 8)) & 0xFFF;
         }else if (fatInfo->fatType == 16)
-                /* Much simpler =) */
                 retVal=*(WORD*)&buff->data[first % BYTES_PER_SECTOR(sBlock)];
         else if (fatInfo->fatType == 32)
@@ -211 +210 @@
                 return 0;
 
+        if (fatInfo->fatType != 32 && cluster == fatInfo->rootDirStart)
+                return fatInfo->rootDirLength*sizeof(struct FatDirEntry);
+
         while (cluster < fatInfo->invalidCluster)
         {
@@ -247 +249 @@
                         if (val >= sbInfo->invalidCluster)
                                 break;
+                                
                         last=val;
                 }
@@ -263 +266 @@
 
         /* Zero out the new sector*/
-        buff=BlockRead(vNode->superBlock->sDevice, FatToSector(vNode->superBlock,ret));
-        ZeroMemory(buff->data,BYTES_PER_SECTOR(vNode->superBlock));
-        BlockWrite(vNode->superBlock->sDevice,buff);
+        buff=BlockRead(vNode->superBlock->sDevice, FatToSector(vNode->superBlock, ret));
+        ZeroMemory(buff->data, BYTES_PER_SECTOR(vNode->superBlock));
+        BlockWrite(vNode->superBlock->sDevice, buff);
         BlockFree(buff);
 
         /* Now add an EOF marker in that last cluster */
-        FatAccess(vNode->superBlock,ret,sbInfo->invalidCluster);
+        FatAccess(vNode->superBlock, ret, sbInfo->invalidCluster);
 
         if (!fatVNodeInfo->startCluster)
@@ -275 +278 @@
         else if (last)
                 /* Add the new cluster onto the end of last */
-                FatAccess(vNode->superBlock,last,ret);
+                FatAccess(vNode->superBlock, last, ret);
 
         if (lastCluster)

Whitix/branches/keobject/fs/fat/file.c

@@ -64 +64 @@
  ***********************************************************************/
 
+/* FIXME: Needs simplify, especially the main while case. */
+
 int FatBlockMap(struct VNode* vNode, DWORD offset, int flags)
 {
@@ -74 +76 @@
          * is given in the FAT's superblock), so make sure the offset is within limits.
          * In FAT32, this is not a problem as a root directory operates like a normal
-         * directory. 
-         * Why couldn't FAT12 and FAT16 have done that in the first place? 
-         *
+         * directory.
          */
 
@@ -86 +86 @@
                 return fatSbInfo->rootDirStart+offset;
         }
+        
+        offset/=fatSbInfo->secsPerClus;
 
         /* The vNode might not have a start cluster because it has just been created. */
@@ -92 +94 @@
                 if (flags & VFS_MAP_CREATE)
                 {
-                        FatAddCluster(vNode, NULL);
-                        return FatGetPriv(vNode)->startCluster;
+                        if (FatAddCluster(vNode, NULL))
+                                return -1;
+                                
+                        return FatToSector(vNode->superBlock, FatGetPriv(vNode)->startCluster)
+                                + offset;
                 }else
                         return -1;
         }
-
-        offset/=fatSbInfo->secsPerClus;
 
         while (offset--)
@@ -105 +108 @@
                 if (retVal >= fatSbInfo->invalidCluster)
                 {
-                        DWORD lastCluster=0;
+                        DWORD lastCluster;
 
                         if (!(flags & VFS_MAP_CREATE))
                                 return -1;
 
+                        offset++;
+
                         /* Add a new cluster if the block requested is one more than needed. */
                         while (offset--)
-                                FatAddCluster(vNode, &lastCluster);
-
-                        KePrint("lastCluster = %#X\n", lastCluster);
-
-                        return lastCluster+(origOffset % fatSbInfo->secsPerClus);
+                        {
+                                if (FatAddCluster(vNode, &lastCluster))
+                                        return -1;
+                        }
+                        
+                        return FatToSector(vNode->superBlock, lastCluster)+
+                                (origOffset % fatSbInfo->secsPerClus);
                 }
         }

Whitix/branches/keobject/fs/fat/vnode.c

@@ -132 +132 @@
                                                          struct FatDirEntry* retVal,DWORD* vNum,DWORD* wantedStart)
 {
-        /* Scanning the root directory (of fat12 and fat16) is a special case because it is linear and it's not possible
-        to GetNextCluster() on it */
-
-        DWORD i=start;
+        /* Scanning the root directory (of fat12 and fat16) is a special case 
+         * because it is linear and it's not possible to GetNextCluster() on it */
+        
         int err=0;
+        int i=0;
         struct FatSbInfo* sbInfo=FatGetSbPriv(superBlock);
 
-        while (i<sbInfo->rootDirLength)
+        while ( i < sbInfo->rootDirLength)
         {
                 DWORD cluster=0;
-                cluster=FatToSector(superBlock,cluster)+i;
+                cluster=start+i;
                 err=FatDirScanSector(superBlock,cluster,name,retVal,vNum,wantedStart);
 
@@ -168 +168 @@
 {
         struct FatSbInfo* sbInfo=FatGetSbPriv(superBlock);
-        if (!start && sbInfo->fatType != 32)
+        if (sbInfo->fatType != 32 && start == sbInfo->rootDirStart)
                 return FatScanDirRootRaw(superBlock,start,name,retVal,vNum,wantedStart);
         else
@@ -191 +191 @@
 }
 
-int FatParentVNo(struct VNode* dir,DWORD* vNum)
+int FatParentVNo(struct VNode* dir, DWORD* vNum)
 {
         int err;
@@ -204 +204 @@
                 FAT_DOTDOT, NULL, NULL, &startCluster);
                 
+        if (err)
+                return err;
+                
         /* Is the root directory then */
         if (startCluster == FatGetSbPriv(dir->superBlock)->rootDirStart)
@@ -227 +230 @@
                 /* Find the (proper) parent vNode number, and jump ahead. */
                 err=FatParentVNo(dir, &vNum);
-
+                
                 if (err)
                         return err;
@@ -233 +236 @@
                 goto getVNode;
         }
-
+        
         /* Otherwise, for a normal entry, just scan the directory. */
         err=FatScanDir(dir,name,nameLength,NULL,&vNum,NULL);
@@ -576 +579 @@
 
         err=FatCreateEntry(dir,name,nameLength,ATTR_ARCHIVE,&vNum);
+        
         if (err)
                 return err;
@@ -608 +612 @@
         /* Add the '.' entry */
         err=FatAddShortName(*retVal,FAT_DOT,-1,&vNum,ATTR_DIR);
+        
         if (err)
                 goto error;
 
         buffer=BlockRead(dir->superBlock->sDevice,VNUM_TO_SECTOR(vNum));
+        
         dirEntry=(struct FatDirEntry*)(buffer->data+VNUM_TO_OFFSET(vNum)*sizeof(struct FatDirEntry));
 
@@ -637 +643 @@
         
 error:
+        KePrint(KERN_DEBUG "Could not add %s, %d\n", name, err);
         return err;
 }