Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-19 20:19:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed initialization/deinitialization of caching.

Browse source 
svn path=/trunk/; revision=3479
This commit is contained in:
Hartmut Birr 2002-09-09 17:26:24 +00:00
parent b35e9d39b5
commit b06d4dcc2f
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/drivers/fs/cdfs/fcb.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: fcb.c,v 1.9 2002/09/08 10:22:09 chorns Exp $ /* $Id: fcb.c,v 1.10 2002/09/09 17:26:24 hbirr Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -155,7 +155,6 @@ CdfsReleaseFCB(PDEVICE_EXTENSION Vcb,
if (Fcb->RefCount <= 0 && !CdfsFCBIsDirectory(Fcb)) if (Fcb->RefCount <= 0 && !CdfsFCBIsDirectory(Fcb))
{ {
RemoveEntryList(&Fcb->FcbListEntry); RemoveEntryList(&Fcb->FcbListEntry);
CcRosReleaseFileCache(NULL, Fcb->RFCB.Bcb);
CdfsDestroyFCB(Fcb); CdfsDestroyFCB(Fcb);
} }
KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql);
@ -386,7 +385,10 @@ CdfsMakeFCBFromDirEntry(PVCB Vcb,
rcFCB->RFCB.FileSize.QuadPart = Size; rcFCB->RFCB.FileSize.QuadPart = Size;
rcFCB->RFCB.ValidDataLength.QuadPart = Size; rcFCB->RFCB.ValidDataLength.QuadPart = Size;
rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, BLOCKSIZE); rcFCB->RFCB.AllocationSize.QuadPart = ROUND_UP(Size, BLOCKSIZE);
if (CdfsFCBIsDirectory(rcFCB))
{
CdfsFCBInitializeCache(Vcb, rcFCB); CdfsFCBInitializeCache(Vcb, rcFCB);
}
rcFCB->RefCount++; rcFCB->RefCount++;
CdfsAddFCBToTable(Vcb, rcFCB); CdfsAddFCBToTable(Vcb, rcFCB);
*fileFCB = rcFCB; *fileFCB = rcFCB;
@ -421,7 +423,7 @@ CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb,
newCCB->PtrFileObject = FileObject; newCCB->PtrFileObject = FileObject;
Fcb->DevExt = Vcb; Fcb->DevExt = Vcb;
if (!(Fcb->Flags & FCB_CACHE_INITIALIZED)) if (CdfsFCBIsDirectory(Fcb))
{ {
Status = CcRosInitializeFileCache(FileObject, Status = CcRosInitializeFileCache(FileObject,
&Fcb->RFCB.Bcb, &Fcb->RFCB.Bcb,

7
reactos/drivers/fs/cdfs/rw.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: rw.c,v 1.4 2002/05/14 23:16:23 ekohl Exp $ /* $Id: rw.c,v 1.5 2002/09/09 17:26:24 hbirr Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -86,6 +86,11 @@ CdfsReadFile(PDEVICE_EXTENSION DeviceExt,
LARGE_INTEGER FileOffset; LARGE_INTEGER FileOffset;
IO_STATUS_BLOCK IoStatus; IO_STATUS_BLOCK IoStatus;
if (FileObject->PrivateCacheMap == NULL)
{
CcRosInitializeFileCache(FileObject, &Fcb->RFCB.Bcb, PAGESIZE);
}
FileOffset.QuadPart = (LONGLONG)ReadOffset; FileOffset.QuadPart = (LONGLONG)ReadOffset;
CcCopyRead(FileObject, CcCopyRead(FileObject,
&FileOffset, &FileOffset,