Changeset 777

Timestamp:

07/11/08 12:17:13 (2 months ago)

Author:

mwhitworth

Message:

Update buffer fixes from branches/fs.

Files:

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

Whitix/trunk/fs/vfs/bcache.c

@@ -95 +95 @@
         INIT_WAITQUEUE_ENTRY(bufferWait);
 
-        WaitAddToQueue(&buffer->waitQueue, &bufferWait);
-
         do
         {
+                WaitAddToQueue(&buffer->waitQueue, &bufferWait);
                 ThrSuspendThread(currThread);
-
-                if (!BufferLocked(buffer))
-                        break;
-
                 ThrSchedule();
         }while (BufferLocked(buffer));
@@ -157 +152 @@
 
         INIT_WAITQUEUE_HEAD(&buff->waitQueue);
+        BufferLock(buff);
         BlockAddToHashTable(buff);
 
@@ -259 +255 @@
                 return -EFAULT;
 
-        /* The buffer will be unlocked in StorageEndRequest */
-        BufferLock(buff);
+        /* Buffer should already be locked if we're coming from BlockRead */
 
         err=BlockSendRequestRaw(device,request);
@@ -308 +303 @@
 
         request=StorageBuildRequest(buff, REQUEST_READ);
-
-        BufferLock(buff);
 
         StorageDoRequest(device,request);
@@ -446 +439 @@
                 ThrSchedule();
 
-                /* Really have to go through everything? */
                 ListForEachEntry(sDevice,&sDeviceList,list)
                         BlockSyncDevice(sDevice);
@@ -480 +472 @@
 {
         struct ListHead* head=BUFFER_HASH(device, blockNum);
-        struct Buffer* curr;
+        struct Buffer* curr, *ret=NULL;
+
+        PreemptDisable();
 
         ListForEachEntry(curr, head, list)
@@ -486 +480 @@
                 {
                         BufferGet(curr);
-                        return curr;
+                        WaitForBuffer(curr);
+                        ret=curr;
+                        goto out;
                 }
 
-        return NULL;
+out:
+        PreemptEnable();
+        return ret;
 }