From 41c5f712cea78d602b363a121dc8a362bc32618b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 7 Jun 2004 22:57:31 +0000 Subject: [PATCH] We're now using fs_interface.h instead of fsproto.h - doesn't change much here :) git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7823 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/bfs/Volume.cpp | 3 ++- src/add-ons/kernel/file_systems/bfs/Volume.h | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/file_systems/bfs/Volume.cpp b/src/add-ons/kernel/file_systems/bfs/Volume.cpp index 40959bc9ce..f1757651db 100644 --- a/src/add-ons/kernel/file_systems/bfs/Volume.cpp +++ b/src/add-ons/kernel/file_systems/bfs/Volume.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -218,7 +219,7 @@ disk_super_block::Initialize(const char *diskName, off_t numBlocks, uint32 block // #pragma mark - -Volume::Volume(nspace_id id) +Volume::Volume(mount_id id) : fID(id), fBlockAllocator(this), diff --git a/src/add-ons/kernel/file_systems/bfs/Volume.h b/src/add-ons/kernel/file_systems/bfs/Volume.h index bf34ede1c5..54b79ea397 100644 --- a/src/add-ons/kernel/file_systems/bfs/Volume.h +++ b/src/add-ons/kernel/file_systems/bfs/Volume.h @@ -8,12 +8,12 @@ #include +#include extern "C" { #ifndef _IMPEXP_KERNEL # define _IMPEXP_KERNEL #endif - #include "fsproto.h" #include "lock.h" #include "cache.h" } @@ -37,7 +37,7 @@ enum volume_initialize_flags { class Volume { public: - Volume(nspace_id id); + Volume(mount_id id); ~Volume(); status_t Mount(const char *device, uint32 flags); @@ -59,7 +59,7 @@ class Volume { vint32 &LogEnd() { return fLogEnd; } int Device() const { return fDevice; } - nspace_id ID() const { return fID; } + mount_id ID() const { return fID; } const char *Name() const { return fSuperBlock.name; } off_t NumBlocks() const { return fSuperBlock.NumBlocks(); } @@ -116,7 +116,7 @@ class Volume { uint32 GetUniqueID(); protected: - nspace_id fID; + mount_id fID; int fDevice; disk_super_block fSuperBlock;