update for HEAD-2003050101

[reactos.git] / drivers / fs / vfat / fsctl.c

diff --git a/drivers/fs/vfat/fsctl.c b/drivers/fs/vfat/fsctl.c
index 5d84d45..b66a377 100644 (file)
--- a/drivers/fs/vfat/fsctl.c
+++ b/drivers/fs/vfat/fsctl.c
@@ -301,15 +301,12 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext)
    wcscpy(Fcb->PathName, L"$$Fat$$");
    Fcb->ObjectName = Fcb->PathName;
    DeviceExt->FATFileObject->Flags = DeviceExt->FATFileObject->Flags | FO_FCB_IS_VALID | FO_DIRECT_CACHE_PAGING_READ;
-   DeviceExt->FATFileObject->FsContext = (PVOID) &Fcb->RFCB;
+   DeviceExt->FATFileObject->FsContext = Fcb;
    DeviceExt->FATFileObject->FsContext2 = Ccb;
    DeviceExt->FATFileObject->SectionObjectPointers = &Fcb->SectionObjectPointers;
    DeviceExt->FATFileObject->PrivateCacheMap = NULL;
    DeviceExt->FATFileObject->Vpb = DeviceObject->Vpb;
-   Ccb->pFcb = Fcb;
-   Ccb->PtrFileObject = DeviceExt->FATFileObject;
    Fcb->FileObject = DeviceExt->FATFileObject;
-   Fcb->pDevExt = (PDEVICE_EXTENSION)DeviceExt->StorageDevice;
 
    Fcb->Flags = FCB_IS_FAT;
 
@@ -319,11 +316,11 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext)
 
    if (DeviceExt->FatInfo.FatType != FAT12)
    {
-      Status = CcRosInitializeFileCache(DeviceExt->FATFileObject, &Fcb->RFCB.Bcb, CACHEPAGESIZE(DeviceExt));
+      Status = CcRosInitializeFileCache(DeviceExt->FATFileObject, CACHEPAGESIZE(DeviceExt));
    }
    else
    {
-      Status = CcRosInitializeFileCache(DeviceExt->FATFileObject, &Fcb->RFCB.Bcb, 2 * PAGE_SIZE);
+      Status = CcRosInitializeFileCache(DeviceExt->FATFileObject, 2 * PAGE_SIZE);
    }
    if (!NT_SUCCESS (Status))
    {
@@ -349,7 +346,6 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext)
    VolumeFcb->RFCB.FileSize.QuadPart = DeviceExt->FatInfo.Sectors * DeviceExt->FatInfo.BytesPerSector;
    VolumeFcb->RFCB.ValidDataLength = VolumeFcb->RFCB.FileSize;
    VolumeFcb->RFCB.AllocationSize = VolumeFcb->RFCB.FileSize;
-   VolumeFcb->pDevExt = (PDEVICE_EXTENSION)DeviceExt->StorageDevice;
    DeviceExt->VolumeFcb = VolumeFcb;
 
    ExAcquireResourceExclusiveLite(&VfatGlobalData->VolumeListLock, TRUE);