Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added a missing check for a valid swap entry in MmPageOutSectionView.

Browse source 
svn path=/trunk/; revision=6403
This commit is contained in:
Hartmut Birr 2003-10-22 18:20:38 +00:00
parent 7cb9ea96db
commit e80fcc0855
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/ntoskrnl/mm/section.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: section.c,v 1.132 2003/10/19 17:33:32 ekohl Exp $ /* $Id: section.c,v 1.133 2003/10/22 18:20:38 hbirr Exp $
* *
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: ntoskrnl/mm/section.c * FILE: ntoskrnl/mm/section.c
@ -1536,7 +1536,6 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
{ {
if (Context.Private) if (Context.Private)
{ {
MmSetSavedSwapEntryPage(PhysicalAddress, 0);
if (!(Context.Segment->Characteristics & IMAGE_SECTION_CHAR_BSS) && if (!(Context.Segment->Characteristics & IMAGE_SECTION_CHAR_BSS) &&
SwapEntry == 0) SwapEntry == 0)
{ {
@ -1548,6 +1547,9 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
} }
else else
{ {
if (SwapEntry != 0)
{
MmSetSavedSwapEntryPage(PhysicalAddress, 0);
Status = MmCreatePageFileMapping(AddressSpace->Process, Status = MmCreatePageFileMapping(AddressSpace->Process,
Address, Address,
SwapEntry); SwapEntry);
@ -1557,6 +1559,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
} }
} }
} }
}
if (DirectMapped && !Context.Private) if (DirectMapped && !Context.Private)
{ {
Status = CcRosUnmapCacheSegment(Bcb, FileOffset, FALSE); Status = CcRosUnmapCacheSegment(Bcb, FileOffset, FALSE);
@ -1845,6 +1848,7 @@ MmWritePageSectionView(PMADDRESS_SPACE AddressSpace,
MmReleasePageOp(PageOp); MmReleasePageOp(PageOp);
return(STATUS_PAGEFILE_QUOTA); return(STATUS_PAGEFILE_QUOTA);
} }
MmSetSavedSwapEntryPage(PhysicalAddress, SwapEntry);
} }
/* /*
@ -1868,7 +1872,6 @@ MmWritePageSectionView(PMADDRESS_SPACE AddressSpace,
* Otherwise we have succeeded. * Otherwise we have succeeded.
*/ */
DPRINT("MM: Wrote section page 0x%.8X to swap!\n", PhysicalAddress); DPRINT("MM: Wrote section page 0x%.8X to swap!\n", PhysicalAddress);
MmSetSavedSwapEntryPage(PhysicalAddress, SwapEntry);
PageOp->Status = STATUS_SUCCESS; PageOp->Status = STATUS_SUCCESS;
KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE);
MmReleasePageOp(PageOp); MmReleasePageOp(PageOp);