From fa0327d6c5f28d59838b240f3e363f82a90606ee Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Sat, 4 Nov 2017 19:46:01 +0100
Subject: [PATCH] [CDFS] Remove the VPB field from the VCB. Not only it was
 never set, but the only times it was used was broken!

---
 drivers/filesystems/cdfs/cdfs.h  | 1 -
 drivers/filesystems/cdfs/fsctl.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/filesystems/cdfs/cdfs.h b/drivers/filesystems/cdfs/cdfs.h
index 3d77e5b645f..dff86cec2e6 100644
--- a/drivers/filesystems/cdfs/cdfs.h
+++ b/drivers/filesystems/cdfs/cdfs.h
@@ -161,7 +161,6 @@ typedef struct
   KSPIN_LOCK FcbListLock;
   LIST_ENTRY FcbListHead;
 
-  PVPB Vpb;
   PDEVICE_OBJECT VolumeDevice;
   PDEVICE_OBJECT StorageDevice;
   PFILE_OBJECT StreamFileObject;
diff --git a/drivers/filesystems/cdfs/fsctl.c b/drivers/filesystems/cdfs/fsctl.c
index f1530770179..44ad59cf228 100644
--- a/drivers/filesystems/cdfs/fsctl.c
+++ b/drivers/filesystems/cdfs/fsctl.c
@@ -419,7 +419,7 @@ CdfsMountVolume(
     DeviceExt->StreamFileObject->FsContext2 = Ccb;
     DeviceExt->StreamFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers;
     DeviceExt->StreamFileObject->PrivateCacheMap = NULL;
-    DeviceExt->StreamFileObject->Vpb = DeviceExt->Vpb;
+    DeviceExt->StreamFileObject->Vpb = DeviceToMount->Vpb;
     Ccb->PtrFileObject = DeviceExt->StreamFileObject;
     Fcb->FileObject = DeviceExt->StreamFileObject;
     Fcb->DevExt = (PDEVICE_EXTENSION)DeviceExt->StorageDevice;