Changeset 760 for Whitix/branches

Timestamp:

07/09/08 15:27:23 (5 months ago)

Author:

mwhitworth

Message:

Add to dirty inode code (actually update the inode in memory), and force commit on inode write.

Files:

• Whitix/branches/fs/fs/ext3/inode.c (modified) (4 diffs)

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

@@ -89 +89 @@
 int Ext3WriteVNode(struct VNode* vNode)
 {
-        KePrint("Ext3WriteVNode\n");
-        return 0;
+        int err;
+
+        /* Force a commit to the journal, to make sure this vNode is written to disk. */
+        PreemptDisable();
+        err=JournalForceCommit(EXT3_JOURNAL(vNode));
+        PreemptEnable();
+
+        return err;
 }
 
@@ -107 +113 @@
 
         return err;
+}
+
+int Ext3INodeUpdate(struct JournalHandle* handle, struct VNode* vNode,
+        struct Buffer* buffer, struct Ext3INode* iNode)
+{
+        if (handle)
+        {
+                /* Call GetWriteAccess? */
+        }
+
+        /* Fill in the raw inode structure. */
+        iNode->aTime=vNode->aTime.seconds;
+        iNode->cTime=vNode->cTime.seconds;
+        iNode->mTime=vNode->mTime.seconds;
+        iNode->size=vNode->size;
+
+        /* TODO: Complete. */
+
+        JournalDirtyMetadata(handle, buffer);
+
+        BufferRelease(buffer);
+
+        return 0;
 }
 
@@ -114 +143 @@
         struct Buffer* buffer;
         struct Ext3INode* iNode;
+        int err=0;
 
         handle=JournalStart(EXT3_JOURNAL(vNode), 2);
@@ -119 +149 @@
         if (handle)
         {
-                Ext3INodeReserveWrite(handle, vNode, &buffer, &iNode);
-        }
-
-        return 0;
+                err=Ext3INodeReserveWrite(handle, vNode, &buffer, &iNode);
+
+                if (!err)
+                {
+                        BufferGet(buffer);
+                        err=Ext3INodeUpdate(handle, vNode, buffer, iNode);
+                        BufferRelease(buffer);
+                }
+        }
+
+        JournalStop(handle);
+
+        return err;
 }
 
 int Ext3Lookup(struct VNode** retVal,struct VNode* dir,char* name,int nameLength)
 {
-        int i=0;
+        DWORD i=0;
         struct Ext3DirEntry* ext3Entry;
         int bytesPerSec=BYTES_PER_SECTOR(dir->superBlock);
 
-        while (i<dir->size)
+        while (i < dir->size)
         {
                 int block=i/bytesPerSec;