From f19500568dc42ab0796a95f81b374a2906dfd18e Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Mon, 25 Jan 2016 15:33:47 -0800 Subject: [PATCH] sys, winfsp-tests: rename SerialNumber to VolumeSerialNumber --- inc/winfsp/fsctl.h | 2 +- src/sys/volinfo.c | 2 +- src/sys/volume.c | 2 +- tst/winfsp-tests/memfs.cpp | 2 +- tst/winfsp-tests/mount-test.c | 8 ++++---- tst/winfsp-tests/timeout-test.c | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/inc/winfsp/fsctl.h b/inc/winfsp/fsctl.h index 507aa487..38a1cd4e 100644 --- a/inc/winfsp/fsctl.h +++ b/inc/winfsp/fsctl.h @@ -113,7 +113,7 @@ typedef struct UINT16 SectorSize; UINT16 SectorsPerAllocationUnit; UINT16 MaxComponentLength; /* maximum file name component length (bytes) */ - UINT32 SerialNumber; /* volume serial number */ + UINT32 VolumeSerialNumber; /* I/O timeouts, capacity, etc. */ UINT32 TransactTimeout; /* FSP_FSCTL_TRANSACT timeout (millis; 1 sec - 10 sec) */ UINT32 IrpTimeout; /* pending IRP timeout (millis; 1 min - 10 min) */ diff --git a/src/sys/volinfo.c b/src/sys/volinfo.c index 8a8a9596..b751b6c4 100644 --- a/src/sys/volinfo.c +++ b/src/sys/volinfo.c @@ -177,7 +177,7 @@ static NTSTATUS FspFsvolQueryFsVolumeInformation( ULONG CopyLength; Info->VolumeCreationTime.QuadPart = VolumeInfo->VolumeCreationTime; - Info->VolumeSerialNumber = FsvolDeviceExtension->VolumeParams.SerialNumber; + Info->VolumeSerialNumber = FsvolDeviceExtension->VolumeParams.VolumeSerialNumber; Info->VolumeLabelLength = VolumeInfo->VolumeLabelLength; Info->SupportsObjects = FALSE; diff --git a/src/sys/volume.c b/src/sys/volume.c index 94686d17..9e3ca313 100644 --- a/src/sys/volume.c +++ b/src/sys/volume.c @@ -397,7 +397,7 @@ NTSTATUS FspVolumeMount( IoAcquireVpbSpinLock(&Irql); Vpb->ReferenceCount++; Vpb->DeviceObject = FsvolDeviceObject; - Vpb->SerialNumber = FsvolDeviceExtension->VolumeParams.SerialNumber; + Vpb->SerialNumber = FsvolDeviceExtension->VolumeParams.VolumeSerialNumber; IoReleaseVpbSpinLock(Irql); /* done with mounting; release the DeleteResource */ diff --git a/tst/winfsp-tests/memfs.cpp b/tst/winfsp-tests/memfs.cpp index 120b7fb6..ff23d88a 100644 --- a/tst/winfsp-tests/memfs.cpp +++ b/tst/winfsp-tests/memfs.cpp @@ -455,7 +455,7 @@ NTSTATUS MemfsCreate(ULONG Flags, ULONG FileInfoTimeout, memset(&VolumeParams, 0, sizeof VolumeParams); VolumeParams.SectorSize = MEMFS_SECTOR_SIZE; VolumeParams.SectorsPerAllocationUnit = MEMFS_SECTORS_PER_ALLOCATION_UNIT; - VolumeParams.SerialNumber = (UINT32)(MemfsGetSystemTime() / (10000 * 1000)); + VolumeParams.VolumeSerialNumber = (UINT32)(MemfsGetSystemTime() / (10000 * 1000)); VolumeParams.FileInfoTimeout = FileInfoTimeout; VolumeParams.CaseSensitiveSearch = 1; VolumeParams.CasePreservedNames = 1; diff --git a/tst/winfsp-tests/mount-test.c b/tst/winfsp-tests/mount-test.c index 6b121df2..df7b5c2a 100644 --- a/tst/winfsp-tests/mount-test.c +++ b/tst/winfsp-tests/mount-test.c @@ -14,7 +14,7 @@ void mount_invalid_test(void) HANDLE VolumeHandle; VolumeParams.SectorSize = 16384; - VolumeParams.SerialNumber = 0x12345678; + VolumeParams.VolumeSerialNumber = 0x12345678; Result = FspFsctlCreateVolume(L"WinFsp.DoesNotExist", &VolumeParams, VolumeName, sizeof VolumeName, &VolumeHandle); ASSERT(STATUS_NO_SUCH_DEVICE == Result); @@ -54,7 +54,7 @@ void mount_create_volume_dotest(PWSTR DeviceName) HANDLE VolumeHandle; VolumeParams.SectorSize = 16384; - VolumeParams.SerialNumber = 0x12345678; + VolumeParams.VolumeSerialNumber = 0x12345678; wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, VolumeName, sizeof VolumeName, &VolumeHandle); @@ -99,7 +99,7 @@ void mount_volume_cancel_dotest(PWSTR DeviceName, PWSTR Prefix) DWORD ExitCode; VolumeParams.SectorSize = 16384; - VolumeParams.SerialNumber = 0x12345678; + VolumeParams.VolumeSerialNumber = 0x12345678; wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, VolumeName, sizeof VolumeName, &VolumeHandle); @@ -158,7 +158,7 @@ void mount_volume_transact_dotest(PWSTR DeviceName, PWSTR Prefix) VolumeParams.TransactTimeout = 10000; /* allow for longer transact timeout to handle MUP redir */ VolumeParams.SectorSize = 16384; - VolumeParams.SerialNumber = 0x12345678; + VolumeParams.VolumeSerialNumber = 0x12345678; wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, VolumeName, sizeof VolumeName, &VolumeHandle); diff --git a/tst/winfsp-tests/timeout-test.c b/tst/winfsp-tests/timeout-test.c index d8df01b9..728a9c03 100644 --- a/tst/winfsp-tests/timeout-test.c +++ b/tst/winfsp-tests/timeout-test.c @@ -48,7 +48,7 @@ void timeout_pending_dotest(PWSTR DeviceName, PWSTR Prefix) VolumeParams.TransactTimeout = 10000; /* allow for longer transact timeout to handle MUP redir */ VolumeParams.IrpTimeout = FspFsctlIrpTimeoutDebug; VolumeParams.SectorSize = 16384; - VolumeParams.SerialNumber = 0x12345678; + VolumeParams.VolumeSerialNumber = 0x12345678; wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, VolumeName, sizeof VolumeName, &VolumeHandle); @@ -159,7 +159,7 @@ void timeout_transact_dotest(PWSTR DeviceName, PWSTR Prefix) VolumeParams.TransactTimeout = 0 != Prefix ? 1000 : 5000; VolumeParams.SectorSize = 16384; - VolumeParams.SerialNumber = 0x12345678; + VolumeParams.VolumeSerialNumber = 0x12345678; wcscpy_s(VolumeParams.Prefix, sizeof VolumeParams.Prefix / sizeof(WCHAR), L"\\winfsp-tests\\share"); Result = FspFsctlCreateVolume(DeviceName, &VolumeParams, VolumeName, sizeof VolumeName, &VolumeHandle);