[UDFS] Reduce mount-time NonPagedPool pressure to allow mounting on Windows Server 2003 with 2 GB RAM

drivers/filesystems/udfs/Include/udf_reg.h

@@ -7,6 +7,7 @@
 #ifndef __DWUDF_REGISTRY__H__
 #define __DWUDF_REGISTRY__H__
 
+
 #define         UDF_BM_FLUSH_PERIOD_NAME    L"BitmapFlushPeriod"
 #define         UDF_TREE_FLUSH_PERIOD_NAME  L"DirTreeFlushPeriod"
 #define         UDF_NO_UPDATE_PERIOD_NAME   L"MaxNoUpdatePeriod"

drivers/filesystems/udfs/close.cpp

@@ -168,6 +168,7 @@ UDFCommonClose(
                     try_return(RC = STATUS_SUCCESS);
                 }
 
+
                 if ((Vcb->VcbCleanup == 0) &&
                     (Vcb->VcbCondition != VcbMounted))  {
 

drivers/filesystems/udfs/create.cpp

@@ -128,6 +128,7 @@ try_exit: NOTHING;
 } // end UDFSupersedeOrOverwriteFile()
 
 
+
 /*************************************************************************
 *
 * Function: UDFOpenExistingFcb()
@@ -997,6 +998,7 @@ try_exit:   NOTHING;
 *
 *************************************************************************/
 static
+
 VOID
 UDFNormalizeStreamSuffix(
     IN PIRP_CONTEXT IrpContext,
@@ -1020,6 +1022,7 @@ UDFNormalizeStreamSuffix(
         return;
     }
 
+
     // Check if there's a second ':' at all — if so, it's an unknown stream type
     PWCHAR buf = Name->Buffer;
     USHORT len = Name->Length / sizeof(WCHAR);
@@ -1030,6 +1033,7 @@ UDFNormalizeStreamSuffix(
     }
 }
 
+
 /*************************************************************************
 *
 * Function: UDFCommonCreate()
@@ -1289,6 +1293,8 @@ UDFCommonCreate(
 
     _SEH2_TRY {
 
+
+
         // Verify that the Vcb is not in an unusable condition.  This routine
         // will raise if not usable.
 
@@ -1360,15 +1366,19 @@ UDFCommonCreate(
                 CreateDisposition == FILE_OVERWRITE_IF ||
                 CreateDisposition == FILE_CREATE) {
 
+
                 try_return(Status = STATUS_ACCESS_DENIED);
+
             }
 
             CurrentFcb = Vcb->VolumeDasdFcb;
 
             // Acquire the Fcb exclusively before completing the open
 
+
             UDFAcquireFcbExclusive(IrpContext, CurrentFcb, FALSE);
 
+
             Status = UDFCompleteFcbOpen(IrpContext,
                                         IrpSp,
                                         Vcb,
@@ -1379,7 +1389,9 @@ UDFCommonCreate(
                                         FALSE,         // VcbLocked
                                         FILE_OPENED);  // DesiredInformation
 
+
             try_return(Status);
+
         }
 
         if (UDFIllegalFcbAccess(Vcb, DesiredAccess)) {
@@ -1406,10 +1418,12 @@ UDFCommonCreate(
                 try_return(Status = STATUS_ACCESS_DENIED);
             }
 
+
             try_return(Status = UDFOpenObjectByFileId(IrpContext,
                                                       IrpSp,
                                                       Vcb,
                                                       &CurrentFcb));
+
         }
 
         //
@@ -1504,7 +1518,9 @@ UDFCommonCreate(
             try_return(Status = STATUS_OBJECT_NAME_INVALID);
         }
         if (StreamOpen && !UDFIsStreamsSupported(Vcb)) {
+
             try_return(Status = STATUS_OBJECT_NAME_INVALID);
+
         }
 
         // RemainingName was set by UDFNormalizeFileNames to point to the relative path
@@ -1846,6 +1862,7 @@ UDFCommonCreate(
                             Status = STATUS_OBJECT_NAME_NOT_FOUND;
                         }
                     }
+
                     if (NT_SUCCESS(Status)) {
                         // Re-inject stream name: next iteration will search
                         // for FinalName within the stream directory.
@@ -1864,6 +1881,7 @@ UDFCommonCreate(
                             &NewFileInfo, &PtrNewFcb);
                         if (NT_SUCCESS(Status)) {
                             LastGoodFileInfo = NewFileInfo;
+
                         } else {
                             // FCB setup failed — close stream dir and exit
                             UDFCloseFile__(IrpContext, Vcb, StreamDirInfo);
@@ -2027,9 +2045,11 @@ UDFCommonCreate(
                     // ... and exit with error
                     try_return(Status);
                 }
+
                 // Note: With LCB model, FcbReference is not incremented during path traversal,
                 // so no decrement is needed here (removed the old InterlockedDecrement).
                 Status = STATUS_SUCCESS;
+
                 ASSERT(!OpenTargetDirectory);
                 // Restore PtrNewFcb/NewFileInfo from last good state.
                 // The stream dir branch didn't open anything in this iteration,
@@ -2079,8 +2099,10 @@ UDFCommonCreate(
             // FILE_CREATED, allocation size, attributes, and notification are
             // all handled inside UDFOpenExistingFcb via CreateDisposition == FILE_CREATE.
 
+
             LastGoodFileInfo = NewFileInfo;
             try_return(Status);
+
         }
 
         // ****************
@@ -2159,10 +2181,12 @@ UDFCommonCreate(
             // thread can have the file stream open at this time.
             RelatedFileInfo = OldRelatedFileInfo;
 
+
             Status = UDFCreateFile__(IrpContext, Vcb, IgnoreCase, &FinalName, 0, 0,
                                  UdfIsExtendedFESupported(Vcb),
                                  (CreateDisposition == FILE_CREATE), RelatedFileInfo, &NewFileInfo);
             if (!NT_SUCCESS(Status)) {
+
                 AdPrint(("    Creation error\n"));
                 try_return(Status);
             }
@@ -2211,6 +2235,8 @@ UDFCommonCreate(
                 }
                 LastGoodFileInfo = NewFileInfo;
 
+
+
                 UDFNotifyReportChange(IrpContext, Vcb, NewFileInfo->Fcb,
                     UDFIsADirectory(NewFileInfo) ? FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME,
                     FILE_ACTION_ADDED,
@@ -2243,11 +2269,15 @@ UDFCommonCreate(
                 }
                 LastGoodFileInfo = NewFileInfo;
 
+
+
                 // PHASE 2: Create stream file in the stream directory
                 RelatedFileInfo = NewFileInfo;
+
                 StreamName.Buffer++;
                 StreamName.Length -= sizeof(WCHAR);
                 Status = UDFCreateFile__(IrpContext, Vcb, IgnoreCase, &StreamName, 0, 0,
+
                          UdfIsExtendedFESupported(Vcb), (CreateDisposition == FILE_CREATE),
                          RelatedFileInfo, &NewFileInfo);
                 if (!NT_SUCCESS(Status)) {
@@ -2372,8 +2402,10 @@ try_exit:   NOTHING;
 
         if (NT_SUCCESS(Status) && PtrNewFcb) {
 
+
             if (DeleteOnClose) {
                 ASSERT(!(PtrNewFcb->FcbState & UDF_FCB_ROOT_DIRECTORY));
+
             }
 
             if (StreamOpen) {
@@ -2832,13 +2864,15 @@ UDFCompleteFcbOpen(
 
     if (!(Ccb = UDFCreateCcb())) {
 
+
         return STATUS_INSUFFICIENT_RESOURCES;
     }
 
     DeleteCcbOnUnwind = TRUE;
 
     _SEH2_TRY {
 
+
         if (AddedAccess) {
 
             ClearFlag(DesiredAccess, AddedAccess);
@@ -3018,6 +3052,7 @@ UDFCompleteFcbOpen(
 
         Fcb->FcbState &= ~UDF_FCB_DELAY_CLOSE;
 
+
         // Increment all reference counts here when CCB is successfully created.
         // If VcbLocked is TRUE, caller already holds VcbMutex - use simple ++.
         // If VcbLocked is FALSE, acquire VcbMutex for atomicity.
@@ -3026,6 +3061,7 @@ UDFCompleteFcbOpen(
             UDFLockVcb(IrpContext, Fcb->Vcb);
         }
 
+
         // Cleanup counts:
         Fcb->FcbCleanup++;
         Fcb->Vcb->VcbCleanup++;

drivers/filesystems/udfs/env_spec.cpp

@@ -556,5 +556,6 @@ UDFNotifyReportChange(
     if (PathAllocated && FullPath.Buffer) {
         ExFreePool(FullPath.Buffer);
     }
+
 }
 

drivers/filesystems/udfs/fileinfo.cpp

@@ -1840,7 +1840,9 @@ UDFPrepareForRenameMoveLink(
     // There is a pair of objects among input dirs &
     // one of them is a parent of another. Sequential resource
     // acquisition may lead to deadlock due to concurrent
+
     // cleanup operations or UDFTeardownStructures()
+
     InterlockedIncrement((PLONG)&Vcb->VcbReference);
 
 
@@ -1852,12 +1854,14 @@ UDFPrepareForRenameMoveLink(
     } else {
         InterlockedDecrement((PLONG)&Vcb->VcbReference);
 
+
         // Child-first lock ordering
         // File1 (child) first, Dir1 (parent) second
         UDF_CHECK_PAGING_IO_RESOURCE(File1->Fcb);
         UDFAcquireFcbExclusive(IrpContext, File1->Fcb, TRUE);
         (*AcquiredFcb1) = TRUE;
 
+
         UDF_CHECK_PAGING_IO_RESOURCE(Dir1->Fcb);
         UDFAcquireFcbExclusive(IrpContext, Dir1->Fcb, TRUE);
         (*AcquiredDir1) = TRUE;
@@ -2284,6 +2288,7 @@ UDFSetRenameInfo(
                          ? FILE_NOTIFY_CHANGE_DIR_NAME
                          : FILE_NOTIFY_CHANGE_FILE_NAME;
 
+
             // Step 1: Notify OLD location (LCB still points to old parent)
             // Use FileObject->FileName — stable path independent of LCB chain
             if (SingleDir && !ReplaceIfExists) {
@@ -2292,8 +2297,10 @@ UDFSetRenameInfo(
             } else {
                 UDFNotifyReportChange(IrpContext, Vcb, Fcb, Filter, FILE_ACTION_REMOVED,
                                       Ccb->Lcb, FileObject);
+
             }
 
+
             // Step 2: Move LCB to new parent and update name
             if (Ccb->Lcb) {
                 RC = UDFRenameMovePrefix(IrpContext, Ccb->Lcb, &NewName,
@@ -2306,6 +2313,7 @@ UDFSetRenameInfo(
             // Step 3: Update FCB parent pointer for cross-directory rename
             if (!SingleDir) {
                 Fcb->ParentFcb = TargetDirInfo->Fcb;
+
             }
 
             // Step 4: Notify NEW location (LCB now points to new parent)

drivers/filesystems/udfs/flush.cpp

@@ -112,6 +112,7 @@ UDFCommonFlush(
         // action we take.
         if ((Fcb == Fcb->Vcb->VolumeDasdFcb) || (Fcb->FcbState & UDF_FCB_ROOT_DIRECTORY)) {
 
+
             UDFFspClose(Vcb);
 
             UDFAcquireVcbExclusive(IrpContext, Vcb, FALSE);

drivers/filesystems/udfs/fscntrl.cpp

@@ -669,16 +669,19 @@ UDFCleanupVCB(
 
     MyFreeMemoryAndPointer(Vcb->Partitions);
     MyFreeMemoryAndPointer(Vcb->LVid);
-    MyFreeMemoryAndPointer(Vcb->Vat);
+    if (Vcb->Vat) {
+        UDFFreeChunked(Vcb->Vat);
+        Vcb->Vat = NULL;
+    }
     MyFreeMemoryAndPointer(Vcb->SparingTable);
 
     if (Vcb->FSBM_Bitmap) {
-        DbgFreePool(Vcb->FSBM_Bitmap);
+        UDFFreeChunked(Vcb->FSBM_Bitmap);
         Vcb->FSBM_Bitmap = NULL;
     }
 
     if (Vcb->BSBM_Bitmap) {
-        DbgFreePool(Vcb->BSBM_Bitmap);
+        UDFFreeChunked(Vcb->BSBM_Bitmap);
         Vcb->BSBM_Bitmap = NULL;
     }
 #ifdef UDF_TRACK_ONDISK_ALLOCATION_OWNERS
@@ -688,7 +691,7 @@ UDFCleanupVCB(
     }
 #endif //UDF_TRACK_ONDISK_ALLOCATION_OWNERS
     if (Vcb->FSBM_OldBitmap) {
-        DbgFreePool(Vcb->FSBM_OldBitmap);
+        UDFFreeChunked(Vcb->FSBM_OldBitmap);
         Vcb->FSBM_OldBitmap = NULL;
     }
 

drivers/filesystems/udfs/protos.h

@@ -693,6 +693,8 @@ UDFFastUnlockAllByKey(
 * Prototypes for the file misc.cpp
 *************************************************************************/
 
+
+
 _IRQL_requires_max_(APC_LEVEL)
 __drv_dispatchType(DRIVER_DISPATCH)
 __drv_dispatchType(IRP_MJ_CREATE)
@@ -868,6 +870,8 @@ UDFInsertFcbIntoTable(
     _In_ PFCB Fcb
     );
 
+
+
 _Ret_valid_ PIRP_CONTEXT
 UDFCreateIrpContext(
     _In_ PIRP Irp,

drivers/filesystems/udfs/read.cpp

@@ -309,6 +309,7 @@ UDFCommonRead(
             Status = UDFReadFile__(IrpContext, Vcb, Fcb->FileInfo, StartingOffset, ByteCount,
                            FALSE, (PCHAR)SystemBuffer, &NumberBytesRead);
 
+
 /*                // AFAIU, CacheManager wants this:
             if (!NT_SUCCESS(RC)) {
                 NumberBytesRead = 0;

drivers/filesystems/udfs/shutdown.cpp

@@ -181,6 +181,7 @@ UDFCommonShutdown(
             UdfData.UDFDeviceObject_HDD = NULL;
         }
 
+
         UDFCompleteRequest(IrpContext, Irp, STATUS_SUCCESS);
 
     } _SEH2_END; // end of "__finally" processing