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

* Cleanup, no functional change.

Browse Source 
+ alphabranch


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32890 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-09-01 13:23:05 +00:00
parent 73e3cd6904
commit a2bb341447
2 changed files with 220 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/disk_device_manager/KPartition.cpp
+214 -223
View File
File diff suppressed because it is too large Load Diff
src/system/kernel/fs/vfs.cpp
+6 -7
View File
@@ -6880,7 +6880,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags,
KPath normalizedDevice; KPath normalizedDevice;
bool newlyCreatedFileDevice = false; bool newlyCreatedFileDevice = false;
if (!(flags & B_MOUNT_VIRTUAL_DEVICE) && device) { if (!(flags & B_MOUNT_VIRTUAL_DEVICE) && device != NULL) {
// normalize the device path // normalize the device path
status = normalizedDevice.SetTo(device, true); status = normalizedDevice.SetTo(device, true);
if (status != B_OK) if (status != B_OK)
@@ -6888,8 +6888,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags,
// get a corresponding partition from the DDM // get a corresponding partition from the DDM
partition = ddm->RegisterPartition(normalizedDevice.Path()); partition = ddm->RegisterPartition(normalizedDevice.Path());
if (partition == NULL) {
if (!partition) {
// Partition not found: This either means, the user supplied // Partition not found: This either means, the user supplied
// an invalid path, or the path refers to an image file. We try // an invalid path, or the path refers to an image file. We try
// to let the DDM create a file device for the path. // to let the DDM create a file device for the path.
@@ -6929,7 +6928,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags,
DeviceWriteLocker writeLocker(diskDevice, true); DeviceWriteLocker writeLocker(diskDevice, true);
// this takes over the write lock acquired before // this takes over the write lock acquired before
if (partition) { if (partition != NULL) {
// make sure, that the partition is not busy // make sure, that the partition is not busy
if (partition->IsBusy()) { if (partition->IsBusy()) {
TRACE(("fs_mount(): Partition is busy.\n")); TRACE(("fs_mount(): Partition is busy.\n"));
@@ -6937,7 +6936,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags,
} }
// if no FS name had been supplied, we get it from the partition // if no FS name had been supplied, we get it from the partition
if (!fsName) { if (fsName == NULL) {
KDiskSystem* diskSystem = partition->DiskSystem(); KDiskSystem* diskSystem = partition->DiskSystem();
if (!diskSystem) { if (!diskSystem) {
TRACE(("fs_mount(): No FS name was given, and the DDM didn't " TRACE(("fs_mount(): No FS name was given, and the DDM didn't "
@@ -7191,7 +7190,7 @@ fs_unmount(char* path, dev_t mountID, uint32 flags, bool kernel)
KDiskDeviceManager* ddm = KDiskDeviceManager::Default(); KDiskDeviceManager* ddm = KDiskDeviceManager::Default();
KPartition* partition = mount->partition; KPartition* partition = mount->partition;
KDiskDevice* diskDevice = NULL; KDiskDevice* diskDevice = NULL;
if (partition) { if (partition != NULL) {
if (partition->Device() == NULL) { if (partition->Device() == NULL) {
dprintf("fs_unmount(): There is no device!\n"); dprintf("fs_unmount(): There is no device!\n");
return B_ERROR; return B_ERROR;
@@ -7205,7 +7204,7 @@ fs_unmount(char* path, dev_t mountID, uint32 flags, bool kernel)
DeviceWriteLocker writeLocker(diskDevice, true); DeviceWriteLocker writeLocker(diskDevice, true);
// make sure, that the partition is not busy // make sure, that the partition is not busy
if (partition) { if (partition != NULL) {
if ((flags & B_UNMOUNT_BUSY_PARTITION) == 0 && partition->IsBusy()) { if ((flags & B_UNMOUNT_BUSY_PARTITION) == 0 && partition->IsBusy()) {
TRACE(("fs_unmount(): Partition is busy.\n")); TRACE(("fs_unmount(): Partition is busy.\n"));
return B_BUSY; return B_BUSY;