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

* Added functions FindPartitionByVolume() and FindPartitionByMountPoint() 

that conveniently bridge BVolumes/mount points with BPartitions.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28346 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-10-27 15:33:37 +00:00
parent 2ec100b72e
commit a58e2ed8f8
2 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
headers/private/storage/DiskDeviceRoster.h
View File

@ -18,6 +18,7 @@ class BDiskDeviceVisitor;
class BDiskScannerPartitionAddOn;
class BDiskSystem;
class BPartition;
class BVolume;
namespace BPrivate {
class AddOnImage;
@ -115,6 +116,13 @@ public:
BDiskDevice* device = NULL,
BPartition** _partition = NULL);
status_t FindPartitionByVolume(BVolume* volume,
BDiskDevice* device,
BPartition** _partition);
status_t FindPartitionByMountPoint(const char* mountPoint,
BDiskDevice* device,
BPartition** _partition);
status_t GetDeviceWithID(partition_id id,
BDiskDevice* device) const;
status_t GetPartitionWithID(partition_id id,

64
src/kits/storage/disk_device/DiskDeviceRoster.cpp
View File

@ -19,6 +19,7 @@
#include <Message.h>
#include <Partition.h>
#include <Path.h>
#include <Volume.h>
#include <syscalls.h>
#include <ddm_userland_interface_defs.h>
@ -224,8 +225,7 @@ BDiskDeviceRoster::VisitEachDevice(BDiskDeviceVisitor *visitor,
*/
bool
BDiskDeviceRoster::VisitEachPartition(BDiskDeviceVisitor *visitor,
BDiskDevice *device,
BPartition **partition)
BDiskDevice *device, BPartition **partition)
{
bool terminatedEarly = false;
if (visitor) {
@ -270,8 +270,7 @@ BDiskDeviceRoster::VisitEachPartition(BDiskDeviceVisitor *visitor,
*/
bool
BDiskDeviceRoster::VisitEachMountedPartition(BDiskDeviceVisitor *visitor,
BDiskDevice *device,
BPartition **partition)
BDiskDevice *device, BPartition **partition)
{
bool terminatedEarly = false;
if (visitor) {
@ -306,8 +305,7 @@ BDiskDeviceRoster::VisitEachMountedPartition(BDiskDeviceVisitor *visitor,
*/
bool
BDiskDeviceRoster::VisitEachMountablePartition(BDiskDeviceVisitor *visitor,
BDiskDevice *device,
BPartition **partition)
BDiskDevice *device, BPartition **partition)
{
bool terminatedEarly = false;
if (visitor) {
@ -322,7 +320,59 @@ BDiskDeviceRoster::VisitEachMountablePartition(BDiskDeviceVisitor *visitor,
return terminatedEarly;
}
// GetDeviceWithID
/*! \brief Finds a BPartition by BVolume.
*/
status_t
BDiskDeviceRoster::FindPartitionByVolume(BVolume* volume, BDiskDevice* device,
BPartition** _partition)
{
class FindPartitionVisitor : public BDiskDeviceVisitor {
public:
FindPartitionVisitor(dev_t volume)
:
fVolume(volume)
{
}
virtual bool Visit(BDiskDevice* device)
{
return Visit(device, 0);
}
virtual bool Visit(BPartition* partition, int32 level)
{
BVolume volume;
return partition->GetVolume(&volume) == B_OK
&& volume.Device() == fVolume;
}
private:
dev_t fVolume;
} visitor(volume->Device());
if (VisitEachMountedPartition(&visitor, device, _partition))
return B_OK;
return B_ENTRY_NOT_FOUND;
}
/*! \brief Finds a BPartition by mount path.
*/
status_t
BDiskDeviceRoster::FindPartitionByMountPoint(const char* mountPoint,
BDiskDevice* device, BPartition** _partition)
{
BVolume volume(dev_for_path(mountPoint));
if (volume.InitCheck() == B_OK
&& FindPartitionByVolume(&volume, device, _partition))
return B_OK;
return B_ENTRY_NOT_FOUND;
}
/*! \brief Returns a BDiskDevice for a given ID.
The supplied \a device is initialized to the device identified by \a id.