Changeset 809

Timestamp:

07/15/08 10:05:10 (3 months ago)

Author:

mwhitworth

Message:

Add comments, fix warnings.

Location:

Whitix/branches/fs/fs/ext3

Files:

• balloc.c (modified) (1 diff)
• ext3.h (modified) (1 diff)
• ialloc.c (modified) (3 diffs)
• inode.c (modified) (5 diffs)
• super.c (modified) (2 diffs)

Whitix/branches/fs/fs/ext3/balloc.c

@@ -90 +90 @@
         
         buffer=BlockRead(superBlock->sDevice, desc->blockBitmap);
+
+        /* TODO: Keep a cache? */
         
         return buffer;

Whitix/branches/fs/fs/ext3/ext3.h

@@ -200 +200 @@
 int Ext3FileWrite(struct File* file,BYTE* buffer,DWORD len);
 
+/* balloc.c */
+struct Ext3GroupDesc* Ext3GetGroupDesc(struct VfsSuperBlock* superBlock, DWORD groupNo,
+        struct Buffer** buffer);
+int Ext3BlockMapHandle(struct JournalHandle* handle, struct VNode* vNode, DWORD block, int flags);
+int Ext3BlockTruncate(struct VNode* vNode, int size);
+
 extern struct VNodeOps ext3VNodeOps;
 extern struct FileOps ext3FileOps;

Whitix/branches/fs/fs/ext3/ialloc.c

@@ -18 +18 @@
 
 #include <bitmap.h>
+#include <malloc.h>
+#include <print.h>
 
 #include "ext3.h"
@@ -37 +39 @@
 struct VNode* Ext3CreateINode(struct JournalHandle* handle, struct VNode* dir, int isDir)
 {
-        DWORD groupNo;
-        struct Ext3GroupDesc* desc;
-        struct Buffer* groupBuffer;
+        DWORD groupNo=0;
+        struct Ext3GroupDesc* desc=NULL;
+        struct Buffer* groupBuffer=NULL;
         struct Buffer* bitmapBuffer;
-        int i;
+        DWORD i;
         struct VfsSuperBlock* superBlock=dir->superBlock;
         struct Ext3SbInfo* sbInfo=EXT3_SUPERINFO(superBlock);
@@ -73 +75 @@
                 }
         }
+
+        if (!groupBuffer || !desc)
+                return -ENOSPC;
         
         bitmapBuffer=Ext3INodeLoadBitmap(superBlock, groupNo);

Whitix/branches/fs/fs/ext3/inode.c

@@ -221 +221 @@
         while (1)
         {
-                if ((char*)entry >= BYTES_PER_SECTOR(vNode->superBlock)+buffer->data)
+                if ((char*)entry >= (char*)(BYTES_PER_SECTOR(vNode->superBlock)+buffer->data))
                 {
                         KePrint("New block?\n");
@@ -347 +347 @@
 int Ext3BlockMap(struct VNode* vNode, DWORD block, int flags)
 {
-        struct Buffer* buff;
         struct JournalHandle* handle=JournalCurrHandle();
         int ret=0;
@@ -365 +364 @@
                 }
 #endif
-
-#if 0
-#endif
         }
         
@@ -458 +454 @@
 }
 
+/*******************************************************************************
+ *
+ * FUNCTION:    Ext3MkDir
+ *
+ * DESCRIPTION: Make a directory in dir with name 'name'.
+ *
+ * PARAMETERS:  retVal - new vNode that points to the new directory.
+ *                              dir - the directory to create the new directory in
+ *                              name - name of the new directory
+ *                              nameLength - length in bytes of the new name.
+ *
+ * RETURNS:             Various errors.
+ *
+ ******************************************************************************/
+ 
 int Ext3MkDir(struct VNode** retVal,struct VNode* dir,char* name,int nameLength)
 {
@@ -466 +477 @@
         
         handle=JournalStart(EXT3_JOURNAL(dir), EXT3_DATA_TRANS);
+        
+        if (!handle)
+                return -EIO;
         
         vNode=Ext3CreateINode(handle, dir, 1);

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

@@ -108 +108 @@
 {
         struct Ext3SbInfo* sb=EXT3_SUPERINFO(superBlock);
-        unsigned long block;
+//      unsigned long block;
 
         return sb->sbSector+i+1;
@@ -128 +128 @@
         
         sbInfo->sbBuffer=BlockRead(superBlock->sDevice, sector);
+
+        if (!sbInfo->sbBuffer)
+                return -EIO;
+
         sbInfo->super=(struct Ext3SuperBlock*)((sbInfo->sbBuffer->data)+offset);
-        sbInfo->sbSector=sector;        
+        sbInfo->sbSector=sector;
+
+        return 0;       
 }