Changeset 778 for Whitix/trunk/fs/vfs/bcache.c

Timestamp:

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

Author:

mwhitworth

Message:

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

Files:

• Whitix/trunk/fs/vfs/bcache.c (modified) (2 diffs)

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;
 }