Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:25:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTFS]

Browse source 
CcInitializeCacheMap can raise exceptions, wrap it into a SEH block

svn path=/trunk/; revision=68228
This commit is contained in:
Pierre Schweitzer 2015-06-21 09:26:15 +00:00
parent f8ba038509
commit bdc699aac8
2 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
reactos/drivers/filesystems/ntfs/fcb.c
View file

@ -263,11 +263,23 @@ NtfsFCBInitializeCache(PNTFS_VCB Vcb,
Fcb->Vcb = Vcb; Fcb->Vcb = Vcb;
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
CcInitializeCacheMap(FileObject, _SEH2_TRY
(PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), {
FALSE, CcInitializeCacheMap(FileObject,
&(NtfsGlobalData->CacheMgrCallbacks), (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize),
Fcb); FALSE,
&(NtfsGlobalData->CacheMgrCallbacks),
Fcb);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
FileObject->FsContext2 = NULL;
ExFreePoolWithTag(newCCB, TAG_CCB);
ObDereferenceObject(FileObject);
Fcb->FileObject = NULL;
return _SEH2_GetExceptionCode();
}
_SEH2_END;
ObDereferenceObject(FileObject); ObDereferenceObject(FileObject);
Fcb->Flags |= FCB_CACHE_INITIALIZED; Fcb->Flags |= FCB_CACHE_INITIALIZED;
@ -483,11 +495,21 @@ NtfsAttachFCBToFileObject(PNTFS_VCB Vcb,
if (!(Fcb->Flags & FCB_CACHE_INITIALIZED)) if (!(Fcb->Flags & FCB_CACHE_INITIALIZED))
{ {
CcInitializeCacheMap(FileObject, _SEH2_TRY
(PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), {
FALSE, CcInitializeCacheMap(FileObject,
&(NtfsGlobalData->CacheMgrCallbacks), (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize),
Fcb); FALSE,
&(NtfsGlobalData->CacheMgrCallbacks),
Fcb);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
FileObject->FsContext2 = NULL;
ExFreePoolWithTag(newCCB, TAG_CCB);
return _SEH2_GetExceptionCode();
}
_SEH2_END;
Fcb->Flags |= FCB_CACHE_INITIALIZED; Fcb->Flags |= FCB_CACHE_INITIALIZED;
} }

19
reactos/drivers/filesystems/ntfs/fsctl.c
View file

@ -495,11 +495,20 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject,
// Fcb->Entry.ExtentLocationL = 0; // Fcb->Entry.ExtentLocationL = 0;
// Fcb->Entry.DataLengthL = DeviceExt->CdInfo.VolumeSpaceSize * BLOCKSIZE; // Fcb->Entry.DataLengthL = DeviceExt->CdInfo.VolumeSpaceSize * BLOCKSIZE;
CcInitializeCacheMap(Vcb->StreamFileObject, _SEH2_TRY
(PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), {
FALSE, CcInitializeCacheMap(Vcb->StreamFileObject,
&(NtfsGlobalData->CacheMgrCallbacks), (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize),
Fcb); TRUE,
&(NtfsGlobalData->CacheMgrCallbacks),
Fcb);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Status = _SEH2_GetExceptionCode();
goto ByeBye;
}
_SEH2_END;
ExInitializeResourceLite(&Vcb->DirResource); ExInitializeResourceLite(&Vcb->DirResource);