From d2a5322576b87a1233fad125b1e0ed70c1800399 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 31 Dec 2017 23:11:12 +0100 Subject: [PATCH] [NTFS] Start using different tags for allocations. They all be Ntf? as for the Windows NTFS driver --- drivers/filesystems/ntfs/fsctl.c | 2 +- drivers/filesystems/ntfs/ntfs.c | 4 ++-- drivers/filesystems/ntfs/ntfs.h | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c index 87858e07c05..c85f1bfb9f6 100644 --- a/drivers/filesystems/ntfs/fsctl.c +++ b/drivers/filesystems/ntfs/fsctl.c @@ -275,7 +275,7 @@ NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject, ExFreePool(BootSector); ExInitializeNPagedLookasideList(&DeviceExt->FileRecLookasideList, - NULL, NULL, 0, NtfsInfo->BytesPerFileRecord, TAG_NTFS, 0); + NULL, NULL, 0, NtfsInfo->BytesPerFileRecord, TAG_FILE_REC, 0); DeviceExt->MasterFileTable = ExAllocateFromNPagedLookasideList(&DeviceExt->FileRecLookasideList); if (DeviceExt->MasterFileTable == NULL) diff --git a/drivers/filesystems/ntfs/ntfs.c b/drivers/filesystems/ntfs/ntfs.c index 53733e1dec3..c29badab08f 100644 --- a/drivers/filesystems/ntfs/ntfs.c +++ b/drivers/filesystems/ntfs/ntfs.c @@ -142,13 +142,13 @@ DriverEntry(PDRIVER_OBJECT DriverObject, /* Initialize lookaside list for IRP contexts */ ExInitializeNPagedLookasideList(&NtfsGlobalData->IrpContextLookasideList, - NULL, NULL, 0, sizeof(NTFS_IRP_CONTEXT), 'PRIN', 0); + NULL, NULL, 0, sizeof(NTFS_IRP_CONTEXT), TAG_IRP_CTXT, 0); /* Initialize lookaside list for FCBs */ ExInitializeNPagedLookasideList(&NtfsGlobalData->FcbLookasideList, NULL, NULL, 0, sizeof(NTFS_FCB), TAG_FCB, 0); /* Initialize lookaside list for attributes contexts */ ExInitializeNPagedLookasideList(&NtfsGlobalData->AttrCtxtLookasideList, - NULL, NULL, 0, sizeof(NTFS_ATTR_CONTEXT), TAG_NTFS, 0); + NULL, NULL, 0, sizeof(NTFS_ATTR_CONTEXT), TAG_ATT_CTXT, 0); /* Driver can't be unloaded */ DriverObject->DriverUnload = NULL; diff --git a/drivers/filesystems/ntfs/ntfs.h b/drivers/filesystems/ntfs/ntfs.h index 7b88f7b7c49..a0cb6ab7cdb 100644 --- a/drivers/filesystems/ntfs/ntfs.h +++ b/drivers/filesystems/ntfs/ntfs.h @@ -14,7 +14,12 @@ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ (pDeviceExt)->NtfsInfo.UCHARsPerCluster : PAGE_SIZE) -#define TAG_NTFS 'SFTN' +#define TAG_NTFS '0ftN' +#define TAG_CCB 'CftN' +#define TAG_FCB 'FftN' +#define TAG_IRP_CTXT 'iftN' +#define TAG_ATT_CTXT 'aftN' +#define TAG_FILE_REC 'rftN' #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_DOWN(N, S) ((N) - ((N) % (S))) @@ -140,9 +145,6 @@ typedef struct ULONG LastOffset; } NTFS_CCB, *PNTFS_CCB; -#define TAG_CCB 'BCCI' -#define TAG_FCB 'BCFI' - typedef struct { NTFSIDENTIFIER Identifier;