Changeset 757 for Whitix/branches

Timestamp:

07/08/08 18:17:04 (5 months ago)

Author:

mwhitworth

Message:

Add to DirtyVNode code.

Files:

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

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

@@ -6 +6 @@
 #include "ext3.h"
 
+int Ext3INodeGetLoc(struct VNode* vNode, struct Buffer** buffer, struct Ext3INode** iNode)
+{
+        DWORD vNo=vNode->id-1;
+        struct Ext3SbInfo* sbInfo=EXT3_SUPERINFO(vNode->superBlock);
+        DWORD blockGroup,groupDesc,desc, block;
+        struct Ext3GroupDesc* groupDescs;
+
+        if (vNo > sbInfo->iNodesCount)
+                return -EINVAL;
+
+        blockGroup=vNo/sbInfo->iNodesPerGrp;
+
+        if (blockGroup >= sbInfo->groupCount)
+                return -EINVAL;
+
+        /* Get the group descriptor for the inode */
+        groupDesc=blockGroup/DESCS_PER_BLOCK(vNode->superBlock);
+        desc=blockGroup & (DESCS_PER_BLOCK(vNode->superBlock)-1);
+
+        groupDescs=(struct Ext3GroupDesc*)(sbInfo->descs[groupDesc]->data);
+
+        if (!groupDescs)
+                return -EFAULT;
+
+        block=groupDescs[desc].iNodeTable+((vNo % sbInfo->iNodesPerGrp)/INODES_PER_BLOCK(vNode->superBlock));
+
+        *buffer=BlockRead(vNode->superBlock->sDevice,block);
+
+        if (!*buffer)
+                return -EIO;
+
+        *iNode=((struct Ext3INode*)(*buffer)->data+(vNo % INODES_PER_BLOCK(vNode->superBlock)));
+
+        return 0;
+}
+
 int Ext3ReadVNode(struct VNode* vNode)
 {
-        struct Ext3SbInfo* sbInfo=(struct Ext3SbInfo*)vNode->superBlock->privData;
-        int blockGroup,groupDesc,desc,block,i;
-        struct Ext3GroupDesc* groupDescs;
         struct Buffer* buffer;
         struct Ext3INode* iNode;
         struct Ext3INodeInfo* iNodeInfo;
-        DWORD vNo=vNode->id-1;
-
-        if (vNo > sbInfo->iNodesCount)
-                return -EINVAL;
-
-        blockGroup=vNo/sbInfo->iNodesPerGrp;
-
-        if (blockGroup >= sbInfo->groupCount)
-                return -EINVAL;
-
-        /* Get the group descriptor for the inode */
-        groupDesc=blockGroup/DESCS_PER_BLOCK(vNode->superBlock);
-        desc=blockGroup & (DESCS_PER_BLOCK(vNode->superBlock)-1);
-
-        groupDescs=(struct Ext3GroupDesc*)(sbInfo->descs[groupDesc]->data);
-
-        if (!groupDescs)
-                return -EFAULT;
-
-        block=groupDescs[desc].iNodeTable+((vNo % sbInfo->iNodesPerGrp)/INODES_PER_BLOCK(vNode->superBlock));
-
-        buffer=BlockRead(vNode->superBlock->sDevice,block);
-
-        if (!buffer)
-                return -EIO;
-
-        iNode=((struct Ext3INode*)buffer->data+(vNo % INODES_PER_BLOCK(vNode->superBlock)));
+        int i, err;
+
+        err=Ext3INodeGetLoc(vNode, &buffer, &iNode);
+
+        if (err)
+                return err;
 
         iNodeInfo=(struct Ext3INodeInfo*)malloc(sizeof(struct Ext3INodeInfo));
@@ -81 +93 @@
 }
 
+int Ext3INodeReserveWrite(struct JournalHandle* handle, struct VNode* vNode,
+        struct Buffer** buffer, struct Ext3INode** iNode)
+{
+        int err;
+
+        /* Fill in buffer and iNode first, before signalling to the journal that we're
+         * going to write at that disk location. */
+
+        err=Ext3INodeGetLoc(vNode, buffer, iNode);
+
+        if (!err)
+                err=JournalGetWriteAccess(handle, *buffer);
+
+        return err;
+}
+
 int Ext3DirtyVNode(struct VNode* vNode)
 {
         struct JournalHandle* handle;
+        struct Buffer* buffer;
+        struct Ext3INode* iNode;
 
         handle=JournalStart(EXT3_JOURNAL(vNode), 2);
+
+        if (handle)
+        {
+                Ext3INodeReserveWrite(handle, vNode, &buffer, &iNode);
+        }
 
         return 0;