update for HEAD-2003050101

[reactos.git] / drivers / fs / cdfs / fcb.c

diff --git a/drivers/fs/cdfs/fcb.c b/drivers/fs/cdfs/fcb.c
index fa54c38..c5295b9 100644 (file)
--- a/drivers/fs/cdfs/fcb.c
+++ b/drivers/fs/cdfs/fcb.c
@@ -187,7 +187,7 @@ CdfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb,
   if (FileName == NULL || *FileName == 0)
     {
       DPRINT("Return FCB for stream file object\n");
-      Fcb = ((PCCB)Vcb->StreamFileObject->FsContext2)->Fcb;
+      Fcb = Vcb->StreamFileObject->FsContext;
       Fcb->RefCount++;
       KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql);
       return(Fcb);
@@ -237,15 +237,13 @@ CdfsFCBInitializeCache(PVCB Vcb,
   FileObject->Flags = FileObject->Flags | FO_FCB_IS_VALID |
       FO_DIRECT_CACHE_PAGING_READ;
   FileObject->SectionObjectPointers = &Fcb->SectionObjectPointers;
-  FileObject->FsContext = (PVOID) &Fcb->RFCB;
+  FileObject->FsContext = Fcb;
   FileObject->FsContext2 = newCCB;
-  newCCB->Fcb = Fcb;
   newCCB->PtrFileObject = FileObject;
   Fcb->FileObject = FileObject;
   Fcb->DevExt = Vcb;
 
   Status = CcRosInitializeFileCache(FileObject,
-                                   &Fcb->RFCB.Bcb,
                                    PAGE_SIZE);
   if (!NT_SUCCESS(Status))
     {
@@ -417,16 +415,14 @@ CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb,
   FileObject->Flags = FileObject->Flags | FO_FCB_IS_VALID |
       FO_DIRECT_CACHE_PAGING_READ;
   FileObject->SectionObjectPointers = &Fcb->SectionObjectPointers;
-  FileObject->FsContext = (PVOID)&Fcb->RFCB;
+  FileObject->FsContext = Fcb;
   FileObject->FsContext2 = newCCB;
-  newCCB->Fcb = Fcb;
   newCCB->PtrFileObject = FileObject;
   Fcb->DevExt = Vcb;
 
   if (CdfsFCBIsDirectory(Fcb))
     {
       Status = CcRosInitializeFileCache(FileObject,
-                                       &Fcb->RFCB.Bcb,
                                        PAGE_SIZE);
       if (!NT_SUCCESS(Status))
        {