Changeset 807

Timestamp:

07/15/08 09:25:26 (2 months ago)

Author:

mwhitworth

Message:

Add to Ext3CreateINode function, add to Ext3BlockRead function.

Location:

Whitix/branches/fs/fs/ext3

Files:

• ext3.h (modified) (1 diff)
• ialloc.c (modified) (3 diffs)
• super.c (modified) (1 diff)

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

@@ -192 +192 @@
 int Ext3ReadDir(struct File* file,void* dirEntries);
 int Ext3BlockMap(struct VNode* vNode, DWORD block, int flags);
-struct Buffer* Ext3BlockRead(struct VNode* vNode,int block);
+struct Buffer* Ext3BlockRead(struct VNode* vNode,int block, int create);
 int Ext3Create(struct VNode** retVal,struct VNode* dir,char* name,int nameLength);
 int Ext3Truncate(struct VNode* vNode, int size);
+int Ext3MkDir(struct VNode** retVal,struct VNode* dir,char* name,int nameLength);
+struct VNode* Ext3CreateINode(struct JournalHandle* handle, struct VNode* dir, int isDir);
 
 int Ext3FileWrite(struct File* file,BYTE* buffer,DWORD len);

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

@@ -35 +35 @@
 }
  
-struct VNode* Ext3CreateINode(struct JournalHandle* handle, struct VNode* dir)
+struct VNode* Ext3CreateINode(struct JournalHandle* handle, struct VNode* dir, int isDir)
 {
         DWORD groupNo;
@@ -47 +47 @@
         struct VNode* vNode;
         
-        /* What happens when a directory is to be created? */
+        if (isDir)
+        {
+                int avgFree=sbInfo->super->freeInodes/sbInfo->groupCount;
+                
+                for (i=0; i<sbInfo->groupCount; i++)
+                {
+                        desc=Ext3GetGroupDesc(superBlock, i, &groupBuffer);
+                        
+                        if (desc && desc->freeINodes && desc->freeINodes >= avgFree)
+                        {
+                                groupNo=i;
+                                break;
+                        }
+                }
+        }else{
+                /* TODO: May have to search other groups. */
+                groupNo=EXT3_INFO(dir)->blockGroup;
         
-        groupNo=EXT3_INFO(dir)->blockGroup;
-        
-        desc=Ext3GetGroupDesc(superBlock, groupNo, &groupBuffer);
+                desc=Ext3GetGroupDesc(superBlock, groupNo, &groupBuffer);
 
-        if (!desc->freeINodes)
-        {
-                KePrint("Need to allocate!\n");
-                cli(); hlt();
+                if (!desc->freeINodes)
+                {
+                        KePrint("Need to allocate!\n");
+                        cli(); hlt();
+                }
         }
         
@@ -112 +127 @@
         vNode->vNodeOps=&ext3VNodeOps;
         vNode->fileOps=&ext3FileOps;
-        vNode->mode=VFS_ATTR_WRITE | VFS_ATTR_READ | VFS_ATTR_FILE;
+
+        vNode->mode=VFS_ATTR_WRITE | VFS_ATTR_READ;
+                
+        if (isDir)
+                vNode->mode |= VFS_ATTR_DIR;
+        else
+                vNode->mode |= VFS_ATTR_FILE;
+                
         vNode->extraInfo=iNodeInfo;
         

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

@@ -37 +37 @@
         .create = Ext3Create,
         .truncate = Ext3Truncate,
+        .mkDir = Ext3MkDir,
 };