Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Class Node already had a list_link field, so Partition::fNext was not only

Browse Source 
wrong, but also completely senseless :-)
Renamed Partition::NextOffset() to LinkOffset() to honour that change.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4623 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2003-09-11 18:58:05 +00:00
parent 9a7a3f03c1
commit 9225f27c04
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/kernel/boot/loader/Partition.h
View File

@ -26,12 +26,11 @@ class Partition : public partition_data, public Node {
Partition *Parent() const { return fParent; }
bool IsFileSystem() const { return fIsFileSystem; }
static int32 NextOffset() { return offsetof(Partition, fNext); }
static size_t LinkOffset() { return sizeof(partition_data); }
private:
void SetParent(Partition *parent) { fParent = parent; }
Partition *fNext;
int fFD;
list fChildren;
Partition *fParent;

2
src/kernel/boot/loader/partitions.cpp
View File

@ -60,7 +60,7 @@ Partition::Partition(int fd)
// it's safe to close the file
fFD = dup(fd);
list_init_etc(&fChildren, Partition::NextOffset());
list_init_etc(&fChildren, Partition::LinkOffset());
}

4
src/kernel/boot/loader/vfs.cpp
View File

@ -343,7 +343,7 @@ vfs_init(stage2_args *args)
status_t
mount_boot_file_systems()
{
list_init_etc(&gPartitions, Partition::NextOffset());
list_init_etc(&gPartitions, Partition::LinkOffset());
gRoot = new RootFileSystem();
if (gRoot == NULL)
@ -362,7 +362,7 @@ mount_boot_file_systems()
}
if (list_is_empty(&gPartitions))
panic("Could not find any partitions on the boot devices");
return B_ENTRY_NOT_FOUND;
return B_OK;
}