Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions drivers/filesystems/udfs/udf_info/mount.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ UDFPrepareXSpaceBitmap(
LBS = Vcb->SectorSize;

*XSl = sizeof(SPACE_BITMAP_DESC) + ((plen+7)>>3);
_XSBM = (int8*)DbgAllocatePool(NonPagedPool, (*XSl + BS - 1) & ~(BS-1) );
_XSBM = (int8*)DbgAllocatePool(PagedPool, (*XSl + BS - 1) & ~(BS-1) );
*XSBM = _XSBM;

switch (XSpaceBitmap->extLength >> 30) {
Expand Down Expand Up @@ -1643,7 +1643,7 @@ UDFAddXSpaceBitmap(
i=UDFPartStart(Vcb, RefPartNum);
flags = bm->extLength >> 30;
if (!flags /*|| flags == EXTENT_NOT_RECORDED_ALLOCATED*/) {
tmp = (int8*)DbgAllocatePool(NonPagedPool, max(Length, Vcb->SectorSize));
tmp = (int8*)DbgAllocatePool(PagedPool, max(Length, Vcb->SectorSize));
if (!tmp) return STATUS_INSUFFICIENT_RESOURCES;
locAddr.partitionReferenceNum = (uint16)RefPartNum;
locAddr.logicalBlockNum = bm->extPosition;
Expand Down Expand Up @@ -1723,7 +1723,7 @@ UDFVerifyXSpaceBitmap(
// i=UDFPartStart(Vcb, RefPartNum);
flags = bm->extLength >> 30;
if (!flags /*|| flags == EXTENT_NOT_RECORDED_ALLOCATED*/) {
tmp = (int8*)DbgAllocatePool(NonPagedPool, max(Length, Vcb->SectorSize));
tmp = (int8*)DbgAllocatePool(PagedPool, max(Length, Vcb->SectorSize));
if (!tmp) return STATUS_INSUFFICIENT_RESOURCES;
locAddr.partitionReferenceNum = (uint16)RefPartNum;
locAddr.logicalBlockNum = bm->extPosition;
Expand Down Expand Up @@ -1964,13 +1964,13 @@ UDFBuildFreeSpaceBitmap(

if (!(Vcb->FSBM_Bitmap)) {
// init Bitmap buffer if necessary
Vcb->FSBM_Bitmap = (int8*)DbgAllocatePool(NonPagedPool, (i = (Vcb->LastPossibleLBA+1+7)>>3) );
Vcb->FSBM_Bitmap = (int8*)DbgAllocatePool(PagedPool, (i = (Vcb->LastPossibleLBA+1+7)>>3) );
if (!(Vcb->FSBM_Bitmap)) return STATUS_INSUFFICIENT_RESOURCES;

RtlZeroMemory(Vcb->FSBM_Bitmap, i);

#ifdef UDF_TRACK_ONDISK_ALLOCATION_OWNERS
Vcb->FSBM_Bitmap_owners = (uint32*)DbgAllocatePool(NonPagedPool, (Vcb->LastPossibleLBA+1)*sizeof(uint32));
Vcb->FSBM_Bitmap_owners = (uint32*)DbgAllocatePool(PagedPool, (Vcb->LastPossibleLBA+1)*sizeof(uint32));
if (!(Vcb->FSBM_Bitmap_owners)) {
MyFreePool__(Vcb->ZSBM_Bitmap);
Vcb->ZSBM_Bitmap = NULL;
Expand Down Expand Up @@ -2964,7 +2964,7 @@ UDFGetDiskInfoAndVerify(

UDFLoadFileset(Vcb,FileSetDesc, &(Vcb->RootLbAddr), &(Vcb->SysStreamLbAddr));

Vcb->FSBM_OldBitmap = (int8*)DbgAllocatePool(NonPagedPool, Vcb->FSBM_ByteCount);
Vcb->FSBM_OldBitmap = (int8*)DbgAllocatePool(PagedPool, Vcb->FSBM_ByteCount);
if (!(Vcb->FSBM_OldBitmap)) try_return(RC = STATUS_INSUFFICIENT_RESOURCES);
RtlCopyMemory(Vcb->FSBM_OldBitmap, Vcb->FSBM_Bitmap, Vcb->FSBM_ByteCount);

Expand All @@ -2976,4 +2976,3 @@ try_exit: NOTHING;
return(RC);

} // end UDFGetDiskInfoAndVerify()

2 changes: 1 addition & 1 deletion drivers/filesystems/udfs/udf_info/udf_info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3698,7 +3698,7 @@ UDFLoadVAT(
goto err_vat_15;
}
// read VAT & remember old version
Vcb->Vat = (uint32*)DbgAllocatePool(NonPagedPool, (Vcb->LastPossibleLBA+1)*sizeof(uint32) );
Vcb->Vat = (uint32*)DbgAllocatePool(PagedPool, (Vcb->LastPossibleLBA+1)*sizeof(uint32) );
if (!Vcb->Vat) {
goto err_vat_15_2;
}
Expand Down