i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partitions do now know if they actually represent a known partitioning system.

Browse Source 
Now correctly removes the partitioning system from a device when it is no longer
needed. Also resets the parent pointer of its children.
Debug output now goes through dprintf() rather than printf().


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9748 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-11-03 02:17:58 +00:00
parent 127b80eca2
commit 8ba84a800d
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/boot/loader/partitions.cpp
+20 -7
View File
@@ -1,6 +1,6 @@
/* /*
** Copyright 2003-2004, Axel Dörfler, [email protected]. All rights reserved. ** Copyright 2003-2004, Axel Dörfler, [email protected]. All rights reserved.
** Distributed under the terms of the OpenBeOS License. ** Distributed under the terms of the Haiku License.
*/ */
@@ -18,9 +18,9 @@
using namespace boot; using namespace boot;
#define TRACE_PARTITIONS //#define TRACE_PARTITIONS
#ifdef TRACE_PARTITIONS #ifdef TRACE_PARTITIONS
# define TRACE(x) printf x # define TRACE(x) dprintf x
#else #else
# define TRACE(x) ; # define TRACE(x) ;
#endif #endif
@@ -91,7 +91,8 @@ class NodeOpener {
Partition::Partition(int fd) Partition::Partition(int fd)
: :
fParent(NULL), fParent(NULL),
fIsFileSystem(false) fIsFileSystem(false),
fIsPartitioningSystem(false)
{ {
memset((partition_data *)this, 0, sizeof(partition_data)); memset((partition_data *)this, 0, sizeof(partition_data));
id = (partition_id)this; id = (partition_id)this;
@@ -221,6 +222,8 @@ Partition::Scan(bool mountFileSystems)
module->free_identify_partition_cookie(this, cookie); module->free_identify_partition_cookie(this, cookie);
if (status == B_OK) { if (status == B_OK) {
fIsPartitioningSystem = true;
// now that we've found something, check our children // now that we've found something, check our children
// out as well! // out as well!
@@ -280,11 +283,21 @@ add_partitions_for(int fd, bool mountFileSystems)
// add this partition to the list of partitions, if it contains // add this partition to the list of partitions, if it contains
// or might contain a file system // or might contain a file system
if ((partition->Scan(mountFileSystems) == B_OK && partition->IsFileSystem()) if ((partition->Scan(mountFileSystems) == B_OK && partition->IsFileSystem())
|| (!partition->IsFileSystem() && !mountFileSystems)) { || (!partition->IsPartitioningSystem() && !mountFileSystems)) {
gPartitions.Add(partition); gPartitions.Add(partition);
return B_OK; return B_OK;
} }
// if not, we'll need to tell the children that their parent is gone
NodeIterator iterator = gPartitions.Iterator();
Partition *child = NULL;
while ((child = (Partition *)iterator.Next()) != NULL) {
if (child->Parent() == partition)
child->SetParent(NULL);
}
delete partition; delete partition;
return B_OK; return B_OK;
} }
@@ -301,7 +314,7 @@ add_partitions_for(Node *device, bool mountFileSystems)
status_t status = add_partitions_for(fd, mountFileSystems); status_t status = add_partitions_for(fd, mountFileSystems);
if (status < B_OK) if (status < B_OK)
printf("add_partitions_for(%d) failed: %ld\n", fd, status); dprintf("add_partitions_for(%d) failed: %ld\n", fd, status);
close(fd); close(fd);
return B_OK; return B_OK;
@@ -314,7 +327,7 @@ create_child_partition(partition_id id, int32 index, partition_id childID)
Partition &partition = *(Partition *)id; Partition &partition = *(Partition *)id;
Partition *child = partition.AddChild(); Partition *child = partition.AddChild();
if (child == NULL) { if (child == NULL) {
printf("creating partition failed: no memory\n"); dprintf("creating partition failed: no memory\n");
return NULL; return NULL;
} }