* KDiskDeviceManager::_ScanPartition() can now run synchronously (and execute the
scan job in the calling thread). * KDiskDeviceManager::InitialDeviceScan() now runs synchronously, so that get_boot_partitions() doesn't need to do this ugly wait hack. * KDiskDeviceManager::CreateFileDevice() can now run synchronously as well, which fixes a deadlock in fs_mount() - note, mounting file devices still doesn't work, though as Haiku's BFS doesn't allow this right now. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17334 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,11 +1,17 @@
|
||||
// KDiskDeviceManager.h
|
||||
|
||||
/*
|
||||
* Copyright 2004-2006, Haiku, Inc. All rights reserved.
|
||||
* Copyright 2003-2004, Ingo Weinhold, [email protected]. All rights reserved.
|
||||
*
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _K_DISK_DEVICE_MANAGER_H
|
||||
#define _K_DISK_DEVICE_MANAGER_H
|
||||
|
||||
|
||||
#include "disk_device_manager.h"
|
||||
#include "Locker.h"
|
||||
|
||||
|
||||
namespace BPrivate {
|
||||
namespace DiskDevice {
|
||||
|
||||
@@ -61,7 +67,7 @@ public:
|
||||
// unregistered by the caller.
|
||||
|
||||
partition_id CreateFileDevice(const char *filePath,
|
||||
bool *newlyCreated = NULL);
|
||||
bool *newlyCreated = NULL, bool async = true);
|
||||
status_t DeleteFileDevice(const char *filePath);
|
||||
status_t DeleteFileDevice(partition_id id);
|
||||
|
||||
@@ -130,7 +136,7 @@ private:
|
||||
bool updateBusyPartitions);
|
||||
|
||||
status_t _Scan(const char *path);
|
||||
status_t _ScanPartition(KPartition *partition);
|
||||
status_t _ScanPartition(KPartition *partition, bool async);
|
||||
// the manager must be locked and the device write locked
|
||||
|
||||
struct DeviceMap;
|
||||
|
||||
Reference in New Issue
Block a user