Changeset 798

Timestamp:

07/14/08 20:32:53 (2 months ago)

Author:

mwhitworth

Message:

Fix file buffer on multiple transactions, add more locking.

Files:

• Whitix/branches/fs/fs/journal/transaction.c (modified) (7 diffs)

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

@@ -77 +77 @@
         if (numBlocks > journal->maxTransactionBuffers)
         {
-                KePrint(KERN_INFO "JournalStartHandle: handle wants too many credits (%d, "
+                KePrint(KERN_INFO "JournalHandleStart: handle wants too many credits (%d, "
                 "%d)\n", numBlocks, journal->maxTransactionBuffers);
                 return -ENOSPC;
@@ -140 +140 @@
                 return handle;
         }
+        
+        JournalLock(journal);
 
         handle=JournalHandleAllocate(numBlocks);
@@ -145 +147 @@
         ret=JournalHandleStart(journal, handle);
 
+        JournalUnlock(journal);
+
         if (ret)
         {
@@ -202 +206 @@
 
         if (!head)
-        {
-                KePrint("JournalFileBuffer: head = NULL\n");
                 return;
-        }
 
         /* Already filed? */
         if (head->transaction && head->list == type)
                 return;
+                
+        PreemptDisable();
 
         /* 
@@ -216 +219 @@
          */
 
-        if (head->transaction == trans && head->list > 0 && head->list != type)
+        if (head->transaction)
                 JournalUnfileBuffer(head);
         else
@@ -254 +257 @@
         ListAddTail(&head->next, list);
         head->list=type;
+        
+        PreemptEnable();
 }
 
@@ -281 +286 @@
                 {
                         JournalUnlock(journal);
-//                      KePrint("shadow wait, %#X, %u\n", head, JournHeadToBuffer(head)->blockNum);
+                        KePrint("shadow wait, %#X, %u\n", head, JournHeadToBuffer(head)->blockNum);
                         WAIT_ON(head->wait, head->list != JOURN_SHADOW);
                         JournalLock(journal);