From 1b9d001b66f77b8ca39f9e7a4ec7616901efedde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 14 Sep 2003 16:39:03 +0000 Subject: [PATCH] Changed the get_file_system() call to accept a Partition instead of a Node. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4675 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/boot/loader/file_systems/bfs/Stream.h | 2 ++ src/kernel/boot/loader/file_systems/bfs/Volume.h | 6 ++++-- src/kernel/boot/loader/file_systems/bfs/bfs.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/kernel/boot/loader/file_systems/bfs/Stream.h b/src/kernel/boot/loader/file_systems/bfs/Stream.h index d5d2fc7137..264a90a0ad 100644 --- a/src/kernel/boot/loader/file_systems/bfs/Stream.h +++ b/src/kernel/boot/loader/file_systems/bfs/Stream.h @@ -11,6 +11,8 @@ #include +class Node; + namespace BFS { diff --git a/src/kernel/boot/loader/file_systems/bfs/Volume.h b/src/kernel/boot/loader/file_systems/bfs/Volume.h index 37788f59cf..60ac874066 100644 --- a/src/kernel/boot/loader/file_systems/bfs/Volume.h +++ b/src/kernel/boot/loader/file_systems/bfs/Volume.h @@ -8,7 +8,9 @@ #include -class Node; +namespace boot { + class Partition; +} namespace BFS { @@ -19,7 +21,7 @@ class Directory; class Volume { public: - Volume(Node *device); + Volume(boot::Partition *partition); ~Volume(); status_t InitCheck(); diff --git a/src/kernel/boot/loader/file_systems/bfs/bfs.cpp b/src/kernel/boot/loader/file_systems/bfs/bfs.cpp index de05604777..a41517b8d7 100644 --- a/src/kernel/boot/loader/file_systems/bfs/bfs.cpp +++ b/src/kernel/boot/loader/file_systems/bfs/bfs.cpp @@ -21,11 +21,11 @@ using namespace BFS; -Volume::Volume(Node *device) +Volume::Volume(boot::Partition *partition) : fRootNode(NULL) { - fDevice = open_node(device, O_RDONLY); + fDevice = open_node(partition, O_RDONLY); if (fDevice < B_OK) return; @@ -124,9 +124,9 @@ Volume::ToBlockRun(off_t block) const static status_t -bfs_get_file_system(Node *device, ::Directory **_root) +bfs_get_file_system(boot::Partition *partition, ::Directory **_root) { - Volume *volume = new Volume(device); + Volume *volume = new Volume(partition); if (volume == NULL) return B_NO_MEMORY;