update for HEAD-2003091401

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

diff --git a/drivers/fs/ntfs/fsctl.c b/drivers/fs/ntfs/fsctl.c
index 98554d9..d73b31b 100644 (file)
--- a/drivers/fs/ntfs/fsctl.c
+++ b/drivers/fs/ntfs/fsctl.c
@@ -29,7 +29,7 @@
 
 #include <ddk/ntddk.h>
 
-#define NDEBUG
+//#define NDEBUG
 #include <debug.h>
 
 #include "ntfs.h"
@@ -275,12 +275,11 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject,
                sizeof(CCB));
 
   DeviceExt->StreamFileObject->Flags = DeviceExt->StreamFileObject->Flags | FO_FCB_IS_VALID | FO_DIRECT_CACHE_PAGING_READ;
-  DeviceExt->StreamFileObject->FsContext = (PVOID)&Fcb->RFCB;
+  DeviceExt->StreamFileObject->FsContext = Fcb;
   DeviceExt->StreamFileObject->FsContext2 = Ccb;
-  DeviceExt->StreamFileObject->SectionObjectPointers = &Fcb->SectionObjectPointers;
+  DeviceExt->StreamFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers;
   DeviceExt->StreamFileObject->PrivateCacheMap = NULL;
   DeviceExt->StreamFileObject->Vpb = DeviceExt->Vpb;
-  Ccb->Fcb = Fcb;
   Ccb->PtrFileObject = DeviceExt->StreamFileObject;
   Fcb->FileObject = DeviceExt->StreamFileObject;
   Fcb->DevExt = (PDEVICE_EXTENSION)DeviceExt->StorageDevice;
@@ -295,7 +294,6 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject,
 //  Fcb->Entry.DataLengthL = DeviceExt->CdInfo.VolumeSpaceSize * BLOCKSIZE;
 
   Status = CcRosInitializeFileCache(DeviceExt->StreamFileObject,
-                                   &Fcb->RFCB.Bcb,
                                    CACHEPAGESIZE(DeviceExt));
   if (!NT_SUCCESS (Status))
     {