Changeset 746 for Whitix/branches/fs/fs/vfs/file.c

Timestamp:

07/07/08 20:09:01 (5 months ago)

Author:

mwhitworth

Message:

Update calls to blockMap.

Files:

• Whitix/branches/fs/fs/vfs/file.c (modified) (4 diffs)

Whitix/branches/fs/fs/vfs/file.c

@@ -123 +123 @@
                 readSize=MIN(bytesPerSec-readOffset,size);
 
-                res=file->vNode->vNodeOps->blockMap(vNode,file->position / bytesPerSec);
+                res=file->vNode->vNodeOps->blockMap(vNode,file->position / bytesPerSec, 0);
 
                 if (res == -1)
@@ -153 +153 @@
         readOffset /= bytesPerSec;
 
-        res=file->vNode->vNodeOps->blockMap(vNode, readOffset);
+        res=file->vNode->vNodeOps->blockMap(vNode, readOffset, 0);
 
         if (res > 0)
@@ -159 +159 @@
                 BlockReadAhead(vNode->superBlock->sDevice, res);
 
-                res=file->vNode->vNodeOps->blockMap(vNode, readOffset+1);
+                res=file->vNode->vNodeOps->blockMap(vNode, readOffset+1, 0);
 
                 if (res > 0)
@@ -180 +180 @@
         while (size > 0)
         {
-                res=file->vNode->vNodeOps->blockMap(file->vNode, file->position/BYTES_PER_SECTOR(file->vNode->superBlock));
+                res=file->vNode->vNodeOps->blockMap(file->vNode, file->position/BYTES_PER_SECTOR(file->vNode->superBlock), VFS_MAP_CREATE);
 
                 /* Could not find block? Deal with this better. */
-                if (res == -1)
+                if (res < 0)
                         return -EIO;