From 541c05cc85d4328adabd3000569aced5a12b226f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 29 Sep 2003 21:43:11 +0000 Subject: [PATCH] We always resize the partition contents. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4867 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/disk_device_manager/KDiskDeviceJobFactory.h | 3 +-- .../core/disk_device_manager/KDiskDeviceJobFactory.cpp | 6 ++---- .../core/disk_device_manager/KDiskDeviceJobGenerator.cpp | 4 +--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/headers/private/kernel/disk_device_manager/KDiskDeviceJobFactory.h b/headers/private/kernel/disk_device_manager/KDiskDeviceJobFactory.h index f771c1172d..3b07930884 100644 --- a/headers/private/kernel/disk_device_manager/KDiskDeviceJobFactory.h +++ b/headers/private/kernel/disk_device_manager/KDiskDeviceJobFactory.h @@ -18,8 +18,7 @@ public: KDiskDeviceJob *CreateDefragmentJob(partition_id partitionID); KDiskDeviceJob *CreateRepairJob(partition_id partitionID, bool checkOnly); KDiskDeviceJob *CreateResizeJob(partition_id parentID, - partition_id partitionID, off_t size, - bool resizeContents); + partition_id partitionID, off_t size); KDiskDeviceJob *CreateMoveJob(partition_id parentID, partition_id partitionID, off_t offset, const partition_id *contentsToMove, diff --git a/src/kernel/core/disk_device_manager/KDiskDeviceJobFactory.cpp b/src/kernel/core/disk_device_manager/KDiskDeviceJobFactory.cpp index 6b64eeb220..eb22ea9b84 100644 --- a/src/kernel/core/disk_device_manager/KDiskDeviceJobFactory.cpp +++ b/src/kernel/core/disk_device_manager/KDiskDeviceJobFactory.cpp @@ -40,11 +40,9 @@ KDiskDeviceJobFactory::CreateRepairJob(partition_id partitionID, // CreateResizeJob KDiskDeviceJob * KDiskDeviceJobFactory::CreateResizeJob(partition_id parentID, - partition_id partitionID, off_t size, - bool resizeContents) + partition_id partitionID, off_t size) { - return new(nothrow) KResizeJob(parentID, partitionID, size, - resizeContents); + return new(nothrow) KResizeJob(parentID, partitionID, size); } // CreateMoveJob diff --git a/src/kernel/core/disk_device_manager/KDiskDeviceJobGenerator.cpp b/src/kernel/core/disk_device_manager/KDiskDeviceJobGenerator.cpp index 6a57933509..fa83dd64c5 100644 --- a/src/kernel/core/disk_device_manager/KDiskDeviceJobGenerator.cpp +++ b/src/kernel/core/disk_device_manager/KDiskDeviceJobGenerator.cpp @@ -194,11 +194,9 @@ KDiskDeviceJobGenerator::_GenerateResizeJob(KPartition *partition) return B_BAD_VALUE; if (!partition->Parent()) return B_ERROR; - bool hasContents = shadow->DiskSystem() - && !(shadow->ChangeFlags() & B_PARTITION_CHANGED_INITIALIZATION); return _AddJob(fJobFactory->CreateResizeJob(partition->Parent()->ID(), partition->ID(), - shadow->Size(), hasContents)); + shadow->Size())); } // _GenerateChildPlacementJobs