KPartition::UninitializeContents() returns an error code now.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4846 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1760,7 +1760,9 @@ _kern_initialize_partition(partition_id partitionID, int32 changeCounter,
|
|||||||
if (strcmp(name, proposedName))
|
if (strcmp(name, proposedName))
|
||||||
return B_BAD_VALUE;
|
return B_BAD_VALUE;
|
||||||
// unitialize the partition's contents and set the new parameters
|
// unitialize the partition's contents and set the new parameters
|
||||||
partition->UninitializeContents(true);
|
error = partition->UninitializeContents(true);
|
||||||
|
if (error != B_OK)
|
||||||
|
return error;
|
||||||
partition->SetDiskSystem(diskSystem);
|
partition->SetDiskSystem(diskSystem);
|
||||||
error = partition->SetContentName(name);
|
error = partition->SetContentName(name);
|
||||||
if (error != B_OK)
|
if (error != B_OK)
|
||||||
@@ -1788,8 +1790,7 @@ _kern_uninitialize_partition(partition_id partitionID, int32 changeCounter)
|
|||||||
PartitionRegistrar registrar2(partition->Device(), true);
|
PartitionRegistrar registrar2(partition->Device(), true);
|
||||||
DeviceWriteLocker locker(partition->Device(), true);
|
DeviceWriteLocker locker(partition->Device(), true);
|
||||||
// unitialize the partition's contents and set the new parameters
|
// unitialize the partition's contents and set the new parameters
|
||||||
partition->UninitializeContents(true);
|
return partition->UninitializeContents(true);
|
||||||
return B_OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// _kern_create_child_partition
|
// _kern_create_child_partition
|
||||||
|
|||||||
Reference in New Issue
Block a user