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

We're now using fs_interface.h instead of fsproto.h - doesn't change much here :)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7823 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-06-07 22:57:31 +00:00
parent dcceaee3bc
commit 41c5f712ce
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/Volume.cpp
+2 -1
View File
@@ -13,6 +13,7 @@
#include <util/kernel_cpp.h> #include <util/kernel_cpp.h>
#include <KernelExport.h> #include <KernelExport.h>
#include <Drivers.h>
#include <fs_volume.h> #include <fs_volume.h>
#include <stdlib.h> #include <stdlib.h>
@@ -218,7 +219,7 @@ disk_super_block::Initialize(const char *diskName, off_t numBlocks, uint32 block
// #pragma mark - // #pragma mark -
Volume::Volume(nspace_id id) Volume::Volume(mount_id id)
: :
fID(id), fID(id),
fBlockAllocator(this), fBlockAllocator(this),
src/add-ons/kernel/file_systems/bfs/Volume.h
+4 -4
View File
@@ -8,12 +8,12 @@
#include <KernelExport.h> #include <KernelExport.h>
#include <fs_interface.h>
extern "C" { extern "C" {
#ifndef _IMPEXP_KERNEL #ifndef _IMPEXP_KERNEL
# define _IMPEXP_KERNEL # define _IMPEXP_KERNEL
#endif #endif
#include "fsproto.h"
#include "lock.h" #include "lock.h"
#include "cache.h" #include "cache.h"
} }
@@ -37,7 +37,7 @@ enum volume_initialize_flags {
class Volume { class Volume {
public: public:
Volume(nspace_id id); Volume(mount_id id);
~Volume(); ~Volume();
status_t Mount(const char *device, uint32 flags); status_t Mount(const char *device, uint32 flags);
@@ -59,7 +59,7 @@ class Volume {
vint32 &LogEnd() { return fLogEnd; } vint32 &LogEnd() { return fLogEnd; }
int Device() const { return fDevice; } int Device() const { return fDevice; }
nspace_id ID() const { return fID; } mount_id ID() const { return fID; }
const char *Name() const { return fSuperBlock.name; } const char *Name() const { return fSuperBlock.name; }
off_t NumBlocks() const { return fSuperBlock.NumBlocks(); } off_t NumBlocks() const { return fSuperBlock.NumBlocks(); }
@@ -116,7 +116,7 @@ class Volume {
uint32 GetUniqueID(); uint32 GetUniqueID();
protected: protected:
nspace_id fID; mount_id fID;
int fDevice; int fDevice;
disk_super_block fSuperBlock; disk_super_block fSuperBlock;