Changeset 775 for Whitix/branches

Timestamp:

07/10/08 00:14:48 (5 months ago)

Author:

mwhitworth

Message:

Add to JournalCommitTransaction, add stub for JournalWriteMetadataBuffer.

Location:

Whitix/branches/fs/fs/journal

Files:

• commit.c (modified) (4 diffs)
• journals.c (modified) (1 diff)
• transaction.c (modified) (2 diffs)

Whitix/branches/fs/fs/journal/commit.c

@@ -52 +52 @@
 }
 
-int JournalCommitMetadata(struct Journal* journal)
+struct JournalHead* JournalCommitMetadata(struct Journal* journal, struct JournalTrans* commitTrans)
 {
-#if 0
-        ListForEachEntry(head, &commitTrans->metaDataList, next)
+        struct JournalHead* curr, *newHead;
+        struct JournalHead* descriptor=NULL; /* On-disk structure. */
+        struct JournalHeader* dHeader;
+        struct Buffer* buffers[64];
+        int bufIndex=0;
+        int firstTag=0;
+        struct JournalBlockTag* tag;
+        char* tagPointer=NULL;
+        int spaceLeft=-1;
+        DWORD blockNo;
+
+        ListForEachEntry(curr, &commitTrans->metaDataList, next)
         {
                 if (!descriptor)
@@ -69 +79 @@
                         dHeader->blockType=CpuToBe32(JFS_DESC_BLOCK);
                         dHeader->sequence=CpuToBe32(commitTrans->transId);
+
+                        tagPointer=&buffer->data[sizeof(struct JournalHeader)]; 
+                        spaceLeft=journal->sectorSize-sizeof(struct JournalHeader);
+                        firstTag=1;
+
+                        buffers[bufIndex++]=buffer;
+
+                        JournalFileBuffer(descriptor, commitTrans, JOURN_LOGCTL);
                 }
+
+                JournalNextLogBlock(journal, &blockNo);
+
+                JournalWriteMetadataBuffer(commitTrans, curr, &newHead, blockNo);
+                
         }
-#endif
+
+        return descriptor;
 }
 
@@ -79 +103 @@
 {
         struct JournalTrans* commitTrans;
-        struct JournalHead* head;
-        struct JournalHead* descriptor=NULL; /* On-disk structure. */
-        struct JournalHeader* dHeader;
 
         JournalLock(journal);
@@ -105 +126 @@
 
         /* Write out metadata to the journal. */
-        JournalCommitMetadata(journal);
+        JournalCommitMetadata(journal, commitTrans);
 
         JournalUnlock(journal);

Whitix/branches/fs/fs/journal/journals.c

@@ -120 +120 @@
 }
 
+int JournalWriteMetadataBuffer(struct JournalTrans* commmitTrans, struct JournalHead* old, 
+        struct JournalHead* new, DWORD blockNo)
+{
+        KePrint("JournalWriteMetadataBuffer\n");
+
+        return 0;
+}
+
 int JournalNextLogBlock(struct Journal* journal, DWORD* ret)
 {

Whitix/branches/fs/fs/journal/transaction.c

@@ -57 +57 @@
         INIT_LIST_HEAD(&ret->reservedList);
         INIT_LIST_HEAD(&ret->metaDataList);
+        INIT_LIST_HEAD(&ret->logControlList);
 
         /* TODO: Set up timer. */
@@ -212 +213 @@
                         break;
 
+                case JOURN_LOGCTL:
+                        list=&trans->logControlList;
+                        break;
+
                 default:
                         KePrint("FileBuffer: handle %d!\n", type);