From 1d099cad03a4f185107ed93a943203c1411f9283 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 3 Aug 2009 19:01:20 +0000 Subject: [PATCH] Patch by Bryce Groff: Allow passing an ID of any partition contained in the disk device to the locking functions, not only the ID of the disk device itself. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32094 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/disk_device_manager/disk_device_manager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/system/kernel/disk_device_manager/disk_device_manager.cpp b/src/system/kernel/disk_device_manager/disk_device_manager.cpp index 465981ddc3..bafd81bf33 100644 --- a/src/system/kernel/disk_device_manager/disk_device_manager.cpp +++ b/src/system/kernel/disk_device_manager/disk_device_manager.cpp @@ -22,7 +22,7 @@ disk_device_data * write_lock_disk_device(partition_id partitionID) { KDiskDeviceManager *manager = KDiskDeviceManager::Default(); - if (KDiskDevice *device = manager->RegisterDevice(partitionID)) { + if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) { if (device->WriteLock()) return device->DeviceData(); // Only unregister, when the locking fails. The guarantees, that the @@ -38,7 +38,7 @@ void write_unlock_disk_device(partition_id partitionID) { KDiskDeviceManager *manager = KDiskDeviceManager::Default(); - if (KDiskDevice *device = manager->RegisterDevice(partitionID)) { + if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) { bool isLocked = device->IsWriteLocked(); if (isLocked) { device->WriteUnlock(); @@ -54,7 +54,7 @@ disk_device_data * read_lock_disk_device(partition_id partitionID) { KDiskDeviceManager *manager = KDiskDeviceManager::Default(); - if (KDiskDevice *device = manager->RegisterDevice(partitionID)) { + if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) { if (device->ReadLock()) return device->DeviceData(); // Only unregister, when the locking fails. The guarantees, that the @@ -70,7 +70,7 @@ void read_unlock_disk_device(partition_id partitionID) { KDiskDeviceManager *manager = KDiskDeviceManager::Default(); - if (KDiskDevice *device = manager->RegisterDevice(partitionID)) { + if (KDiskDevice *device = manager->RegisterDevice(partitionID, false)) { bool isLocked = device->IsReadLocked(false); if (isLocked) { device->ReadUnlock();