Changeset 856

Timestamp:

08/21/08 21:51:05 (3 years ago)

Author:

mwhitworth

Message:

Update call of blockMap.

Files:

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

Whitix/trunk/fs/vfs/vnode.c

@@ -265 +265 @@
         }
 
-        /* Check if theflags state that the file opened must be a directory. */
+        /* Check if the flags state that the file opened must be a directory. */
         if (*retVal && (flags & FILE_DIRECTORY) && ((*retVal)->flags & VFS_ATTR_DIR))
         {
@@ -300 +300 @@
         for (i=0; i<PAGE_SIZE/blockSize; i++)
         {
-                res=vNode->vNodeOps->blockMap(vNode,(offset/blockSize)+i);
-
-                if (res == -1)
+                res=vNode->vNodeOps->blockMap(vNode,(offset/blockSize)+i, 0);
+
+                if (res < 0)
                         /* Quite unlikely, but I think this is the best way to deal with it */
                         ZeroMemory(page+(i*blockSize), blockSize);
                 else{
-                        buff=BlockRead(vNode->superBlock->sDevice,res);
+                        buff=BlockRead(vNode->superBlock->sDevice, res);
                         if (!buff)
                         {