Changeset 855

Timestamp:

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

Author:

mwhitworth

Message:

Update call of blockMap.

Files:

• Whitix/trunk/fs/vfs/file.c (modified) (10 diffs)

Whitix/trunk/fs/vfs/file.c

@@ -48 +48 @@
                 return;
 
-        vNode->aTime=currTime;
-        SetVNodeDirty(vNode);
+        /* TODO: Check granularity of vNode times on disk. No point dirtying a vNode if
+         * the time isn't updated. */
+
+        if (vNode->aTime.seconds < currTime.seconds)
+        {
+                vNode->aTime=currTime;
+                SetVNodeDirty(vNode);
+        }
 }
 
@@ -74 +80 @@
                 return;
 
-        vNode->mTime=currTime;
-
         /* Has the vNode just been created? If so, record its
         creation time */
@@ -81 +85 @@
                 vNode->cTime=currTime;
 
-        SetVNodeDirty(vNode);
+        /* See VfsFileAccessed comment. */
+        if (vNode->mTime.seconds < currTime.seconds || create)
+        {
+                vNode->mTime=currTime;
+                SetVNodeDirty(vNode);
+        }
 }
 
@@ -123 +132 @@
                 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)
@@ -146 +155 @@
                 copyOffset+=readSize;
                 file->position+=readSize;
+
                 BlockFree(buff);
         }
 
+#if 0
         /* Read in the next few sectors, as part of read-ahead */
         readOffset=((file->position + bytesPerSec-1) & ~(bytesPerSec-1));
         readOffset /= bytesPerSec;
 
-        res=file->vNode->vNodeOps->blockMap(vNode, readOffset);
+        res=file->vNode->vNodeOps->blockMap(vNode, readOffset, 0);
 
         if (res > 0)
@@ -159 +170 @@
                 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)
                         BlockReadAhead(vNode->superBlock->sDevice, res);
         }
+#endif
 
         IrqRestoreFlags(flags);
@@ -180 +192 @@
         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;
 
@@ -276 +288 @@
         file->fileOps=file->vNode->fileOps;
 
-        if (file->fileOps->open)
+        if (file->fileOps && file->fileOps->open)
         {
                 err=file->fileOps->open(file);
@@ -390 +402 @@
 int DoCloseFile(struct File* file)
 {
-        DWORD flags;
-
         if (!file || !file->vNode)
                 return -EFAULT;
@@ -564 +574 @@
                 return -EBADF;
 
-        if (VirtCheckArea((void*)buffer,amount,VER_WRITE))
+        if (VirtCheckArea((void*)buffer, amount, VER_WRITE))
                 return -EFAULT;
+
         return DoReadFile(file,buffer,amount);
 }