From 2ebc053a0152f98013281bbe94f8dd07888398f4 Mon Sep 17 00:00:00 2001 From: Shao Miller Date: Fri, 24 Dec 2010 10:30:09 -0500 Subject: [PATCH 1/1] [disk] Remove prev_free member Since the device structure is right inside the disk structure, we shouldn't try to free the device data. --- src/include/disk.h | 1 - src/winvblock/disk/disk.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/include/disk.h b/src/include/disk.h index 4fab2ad..dfb6854 100644 --- a/src/include/disk.h +++ b/src/include/disk.h @@ -116,7 +116,6 @@ struct WV_DISK_T { winvblock__uint32 Sectors; winvblock__uint32 SectorSize; winvblock__uint32 SpecialFileCount; - WV_FP_DEV_FREE prev_free; LIST_ENTRY tracking; winvblock__any_ptr ext; }; diff --git a/src/winvblock/disk/disk.c b/src/winvblock/disk/disk.c index 71dca75..33ba58b 100644 --- a/src/winvblock/disk/disk.c +++ b/src/winvblock/disk/disk.c @@ -352,7 +352,6 @@ winvblock__lib_func WV_SP_DISK_T disk__create(void) { &disk_list_lock ); /* Populate non-zero device defaults. */ - disk_ptr->prev_free = dev_ptr->Ops.Free; disk_ptr->disk_ops.MaxXferLen = default_max_xfer_len; disk_ptr->disk_ops.Init = WvDiskDefaultInit_; disk_ptr->disk_ops.Close = WvDiskDefaultClose_; @@ -392,8 +391,6 @@ NTSTATUS disk__module_init(void) { static void STDCALL free_disk(IN WV_SP_DEV_T dev_ptr) { WV_SP_DISK_T disk_ptr = disk__get_ptr(dev_ptr); - /* Free the "inherited class". */ - disk_ptr->prev_free(dev_ptr); /* * Track the disk deletion in our global list. Unfortunately, * for now we have faith that a disk won't be deleted twice and -- 2.17.1