Author: pschweitzer
Date: Sun Jul 10 18:16:03 2016
New Revision: 71890
URL: http://svn.reactos.org/svn/reactos?rev=71890&view=rev
Log:
[FASTFAT]
CcMapData 4th arg isn't a boolean but a flag. Fix it accordingly
CcPinRead 4th arg isn't a boolean but a flag. Fix it accordingly
Modified:
trunk/reactos/drivers/filesystems/fastfat/create.c
trunk/reactos/drivers/filesystems/fastfat/direntry.c
trunk/reactos/drivers/filesystems/fastfat/dirwr.c
trunk/reactos/drivers/filesystems/fastfat/volume.c
Modified: trunk/reactos/drivers/filesystems/fastfat/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat/create.c?rev=71890&r1=71889&r2=71890&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Jul 10
18:16:03 2016
@@ -137,7 +137,7 @@
FileOffset.QuadPart = 0;
_SEH2_TRY
{
- CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry, TRUE, &Context,
(PVOID*)&Entry);
+ CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry, MAP_WAIT,
&Context, (PVOID*)&Entry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -176,7 +176,7 @@
FileOffset.u.LowPart += PAGE_SIZE;
_SEH2_TRY
{
- CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry,
TRUE, &Context, (PVOID*)&Entry);
+ CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry,
MAP_WAIT, &Context, (PVOID*)&Entry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Modified: trunk/reactos/drivers/filesystems/fastfat/direntry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat/direntry.c?rev=71890&r1=71889&r2=71890&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1]
(original)
+++ trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1]
Sun Jul 10 18:16:03 2016
@@ -72,7 +72,7 @@
_SEH2_TRY
{
- CcMapData(Fcb->FileObject, &FileOffset, sizeof(FAT_DIR_ENTRY),
TRUE, &Context, (PVOID*)&FatDirEntry);
+ CcMapData(Fcb->FileObject, &FileOffset, sizeof(FAT_DIR_ENTRY),
MAP_WAIT, &Context, (PVOID*)&FatDirEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -132,7 +132,7 @@
_SEH2_TRY
{
- CcMapData(Fcb->FileObject, &FileOffset,
sizeof(FATX_DIR_ENTRY), TRUE, &Context, (PVOID*)&FatXDirEntry);
+ CcMapData(Fcb->FileObject, &FileOffset,
sizeof(FATX_DIR_ENTRY), MAP_WAIT, &Context, (PVOID*)&FatXDirEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -219,7 +219,7 @@
_SEH2_TRY
{
- CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE,
pContext, pPage);
+ CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, MAP_WAIT,
pContext, pPage);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -260,7 +260,7 @@
_SEH2_TRY
{
- CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE,
TRUE, pContext, pPage);
+ CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE,
MAP_WAIT, pContext, pPage);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -297,7 +297,7 @@
_SEH2_TRY
{
- CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE,
TRUE, pContext, pPage);
+ CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE,
MAP_WAIT, pContext, pPage);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -427,7 +427,7 @@
_SEH2_TRY
{
- CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE,
pContext, pPage);
+ CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE,
MAP_WAIT, pContext, pPage);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -525,7 +525,7 @@
_SEH2_TRY
{
- CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE,
pContext, pPage);
+ CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, MAP_WAIT,
pContext, pPage);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -568,7 +568,7 @@
_SEH2_TRY
{
- CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE,
pContext, pPage);
+ CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE,
MAP_WAIT, pContext, pPage);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat/dirwr.c?rev=71890&r1=71889&r2=71890&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Sun Jul 10
18:16:03 2016
@@ -55,7 +55,7 @@
Offset.u.LowPart = dirIndex * SizeDirEntry;
_SEH2_TRY
{
- CcPinRead(pFcb->parentFcb->FileObject, &Offset, SizeDirEntry, TRUE,
&Context, (PVOID*)&PinEntry);
+ CcPinRead(pFcb->parentFcb->FileObject, &Offset, SizeDirEntry,
PIN_WAIT, &Context, (PVOID*)&PinEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -100,7 +100,7 @@
Offset.u.LowPart = (StartIndex * sizeof(FATX_DIR_ENTRY) / PAGE_SIZE) *
PAGE_SIZE;
_SEH2_TRY
{
- CcPinRead(pFcb->parentFcb->FileObject, &Offset,
sizeof(FATX_DIR_ENTRY), TRUE, &Context, (PVOID*)&pDirEntry);
+ CcPinRead(pFcb->parentFcb->FileObject, &Offset,
sizeof(FATX_DIR_ENTRY), PIN_WAIT, &Context, (PVOID*)&pDirEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -178,7 +178,7 @@
}
_SEH2_TRY
{
- CcPinRead(pDirFcb->FileObject, &FileOffset,
DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry);
+ CcPinRead(pDirFcb->FileObject, &FileOffset,
DeviceExt->FatInfo.BytesPerCluster, PIN_WAIT, &Context, (PVOID*)&pFatEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -239,7 +239,7 @@
DeviceExt->FatInfo.BytesPerCluster);
_SEH2_TRY
{
- CcPinRead(pDirFcb->FileObject, &FileOffset,
DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry);
+ CcPinRead(pDirFcb->FileObject, &FileOffset,
DeviceExt->FatInfo.BytesPerCluster, PIN_WAIT, &Context, (PVOID*)&pFatEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -258,7 +258,7 @@
FileOffset.u.LowPart = (*start + nbSlots) * SizeDirEntry;
_SEH2_TRY
{
- CcPinRead(pDirFcb->FileObject, &FileOffset, SizeDirEntry,
TRUE, &Context, (PVOID*)&pFatEntry);
+ CcPinRead(pDirFcb->FileObject, &FileOffset, SizeDirEntry,
PIN_WAIT, &Context, (PVOID*)&pFatEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -579,7 +579,7 @@
/* one cluster */
_SEH2_TRY
{
- CcPinRead(ParentFcb->FileObject, &FileOffset, nbSlots *
sizeof(FAT_DIR_ENTRY), TRUE, &Context, (PVOID*)&pFatEntry);
+ CcPinRead(ParentFcb->FileObject, &FileOffset, nbSlots *
sizeof(FAT_DIR_ENTRY), PIN_WAIT, &Context, (PVOID*)&pFatEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -602,7 +602,7 @@
i = size / sizeof(FAT_DIR_ENTRY);
_SEH2_TRY
{
- CcPinRead(ParentFcb->FileObject, &FileOffset, size, TRUE,
&Context, (PVOID*)&pFatEntry);
+ CcPinRead(ParentFcb->FileObject, &FileOffset, size, PIN_WAIT,
&Context, (PVOID*)&pFatEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -616,7 +616,7 @@
FileOffset.u.LowPart += size;
_SEH2_TRY
{
- CcPinRead(ParentFcb->FileObject, &FileOffset, nbSlots *
sizeof(FAT_DIR_ENTRY) - size, TRUE, &Context, (PVOID*)&pFatEntry);
+ CcPinRead(ParentFcb->FileObject, &FileOffset, nbSlots *
sizeof(FAT_DIR_ENTRY) - size, PIN_WAIT, &Context, (PVOID*)&pFatEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -658,7 +658,7 @@
FileOffset.QuadPart = 0;
_SEH2_TRY
{
- CcPinRead((*Fcb)->FileObject, &FileOffset,
DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry);
+ CcPinRead((*Fcb)->FileObject, &FileOffset,
DeviceExt->FatInfo.BytesPerCluster, PIN_WAIT, &Context, (PVOID*)&pFatEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -785,7 +785,7 @@
FileOffset.u.LowPart = Index * sizeof(FATX_DIR_ENTRY);
_SEH2_TRY
{
- CcPinRead(ParentFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY),
TRUE, &Context, (PVOID*)&pFatXDirEntry);
+ CcPinRead(ParentFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY),
PIN_WAIT, &Context, (PVOID*)&pFatXDirEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -862,7 +862,7 @@
Offset.u.LowPart = (i * sizeof(FAT_DIR_ENTRY) / PAGE_SIZE) *
PAGE_SIZE;
_SEH2_TRY
{
- CcPinRead(pFcb->parentFcb->FileObject, &Offset,
sizeof(FAT_DIR_ENTRY), TRUE, &Context, (PVOID*)&pDirEntry);
+ CcPinRead(pFcb->parentFcb->FileObject, &Offset,
sizeof(FAT_DIR_ENTRY), PIN_WAIT, &Context, (PVOID*)&pDirEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -934,7 +934,7 @@
Offset.u.LowPart = (StartIndex * sizeof(FATX_DIR_ENTRY) / PAGE_SIZE) *
PAGE_SIZE;
_SEH2_TRY
{
- CcPinRead(pFcb->parentFcb->FileObject, &Offset,
sizeof(FATX_DIR_ENTRY), TRUE, &Context, (PVOID*)&pDirEntry);
+ CcPinRead(pFcb->parentFcb->FileObject, &Offset,
sizeof(FATX_DIR_ENTRY), PIN_WAIT, &Context, (PVOID*)&pDirEntry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat/volume.c?rev=71890&r1=71889&r2=71890&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Sun Jul 10
18:16:03 2016
@@ -316,7 +316,7 @@
FileOffset.QuadPart = 0;
_SEH2_TRY
{
- CcPinRead(pRootFcb->FileObject, &FileOffset, SizeDirEntry, TRUE,
&Context, (PVOID*)&Entry);
+ CcPinRead(pRootFcb->FileObject, &FileOffset, SizeDirEntry, PIN_WAIT,
&Context, (PVOID*)&Entry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -351,7 +351,7 @@
FileOffset.u.LowPart += PAGE_SIZE;
_SEH2_TRY
{
- CcPinRead(pRootFcb->FileObject, &FileOffset, SizeDirEntry,
TRUE, &Context, (PVOID*)&Entry);
+ CcPinRead(pRootFcb->FileObject, &FileOffset, SizeDirEntry,
PIN_WAIT, &Context, (PVOID*)&Entry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@@ -386,7 +386,7 @@
Status = STATUS_SUCCESS;
_SEH2_TRY
{
- CcPinRead(pRootFcb->FileObject, &FileOffset, SizeDirEntry,
TRUE, &Context, (PVOID*)&Entry);
+ CcPinRead(pRootFcb->FileObject, &FileOffset, SizeDirEntry,
PIN_WAIT, &Context, (PVOID*)&Entry);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
