Changeset 784

Timestamp:

07/13/08 20:42:47 (3 months ago)

Author:

mwhitworth

Message:

Add error-checking to superblock read code, add FreeSuper function and add to structures.

Location:

Whitix/branches/fs/fs/ext3

Files:

• Makefile (modified) (1 diff)
• super.c (modified) (10 diffs)

Whitix/branches/fs/fs/ext3/Makefile

@@ -1 +1 @@
 DEPTH=../../
-MODULES = super.sys inode.sys file.sys
+MODULES = super.sys inode.sys file.sys ialloc.sys balloc.sys
 
 build: $(MODULES)

Whitix/branches/fs/fs/ext3/super.c

@@ -23 +23 @@
 #include <print.h>
 
+int Ext3FreeSuper(struct VfsSuperBlock* superBlock);
+
 struct SuperBlockOps ext3SbOps={
         .readVNode = Ext3ReadVNode,
         .writeVNode = Ext3WriteVNode,
         .dirtyVNode = Ext3DirtyVNode,
+        .freeSuper = Ext3FreeSuper,
 };
 
@@ -32 +35 @@
         .lookup = Ext3Lookup,
         .blockMap = Ext3BlockMap,
+        .create = Ext3Create,
+        .truncate = Ext3Truncate,
 };
 
@@ -40 +45 @@
 };
 
+int Ext3FreeSuper(struct VfsSuperBlock* superBlock)
+{
+        struct Ext3SbInfo* sb=EXT3_SUPERINFO(superBlock);
+        
+        if (sb && sb->journal)
+                JournalDestroy(sb->journal);
+        
+        if (sb)
+                free(sb);
+                
+        return 0;
+}
+
 int Ext3JournalSetup(struct VfsSuperBlock* superBlock, struct Ext3SuperBlock* sb, DWORD iNo)
 {
@@ -51 +69 @@
                 return 0;
         }
+        
+        if (!journal->size)
+        {
+                KePrint(KERN_ERROR "EXT3: Zero length journal present\n");
+                return -EINVAL;
+        }
 
         /* The journal node must be used (i.e. linked to somewhere). Check! */
@@ -58 +82 @@
         /* Let the journal layer handle the replaying. */
         EXT3_SUPERINFO(superBlock)->journal=JournalCreate(journal);
+        
+        if (!journal)
+                return -EIO;
+        
+        JournalSetUuid(EXT3_SUPERINFO(superBlock)->journal, sb->journalUuid);
 
         return 0;
@@ -68 +97 @@
         if (sb->journalINum)
         {
-                Ext3JournalSetup(superBlock, sb, sb->journalINum);
+                return Ext3JournalSetup(superBlock, sb, sb->journalINum);
         }else
                 KePrint("Ext3JournalInit: get dev journal\n");
 
-        return 0;
+        return -ENOTIMPL;
 }
 
@@ -80 +109 @@
         unsigned long block;
 
-        /* TODO: Figure out logic superblock sector. */
-
-        return i+1;
+        return sb->sbSector+i+1;
 
         /* Check features for meta block group */
@@ -90 +117 @@
         return sb->firstDataBlock+(block*sb->blocksPerGrp);
 #endif
+}
+
+int Ext3ReadSuperBlock(struct VfsSuperBlock* superBlock, struct Ext3SbInfo* sbInfo)
+{
+        int sector, offset;
+        
+        sector=1*1024/BYTES_PER_SECTOR(superBlock);
+        offset=(1*1024) % BYTES_PER_SECTOR(superBlock);
+        
+        sbInfo->sbBuffer=BlockRead(superBlock->sDevice, sector);
+        sbInfo->super=(struct Ext3SuperBlock*)((sbInfo->sbBuffer->data)+offset);
+        sbInfo->sbSector=sector;        
 }
 
@@ -138 +177 @@
 
         sbInfo->firstDataBlock=sb.firstDataBlock;
+        
+        /* Read in the superblock again. */
+        Ext3ReadSuperBlock(retVal, sbInfo);
 
         /* And set the Ext3-specific parts of the superblock structure. */
@@ -158 +200 @@
         if (EXT3_FEATURE_COMPAT(&sb, EXT3_FEATURE_COMPAT_JOURNAL))
         {
-                Ext3JournalInit(retVal, &sb);
+                if (Ext3JournalInit(retVal, &sb))
+                        goto descsFree;
+                
+                /* Write journal superblock. */
         }