Changeset 778

Timestamp:

07/11/08 12:23:03 (2 months ago)

Author:

mwhitworth

Message:

Fix preemption code in bcache.c and vcache.c.

Location:

Whitix/trunk/fs/vfs

Files:

• bcache.c (modified) (2 diffs)
• vcache.c (modified) (1 diff)

Whitix/trunk/fs/vfs/bcache.c

@@ -472 +472 @@
 {
         struct ListHead* head=BUFFER_HASH(device, blockNum);
-        struct Buffer* curr, *ret=NULL;
+        struct Buffer* curr;
 
         PreemptDisable();
@@ -480 +480 @@
                 {
                         BufferGet(curr);
+                        PreemptEnable(); /* As WaitForBuffer may sleep. */
                         WaitForBuffer(curr);
-                        ret=curr;
-                        goto out;
+                        return curr;
                 }
 
-out:
         PreemptEnable();
-        return ret;
+        return NULL;
 }
 

Whitix/trunk/fs/vfs/vcache.c

@@ -60 +60 @@
                         /* Found it */
                         ++curr->refs;
+                        SpinUnlock(&superBlock->nodeListLock);
                         VNodeWaitOn(curr);
-                        SpinUnlock(&superBlock->nodeListLock);
                         return curr;
                 }