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

* _user_uninitialize_partition() never marked the partition unbusy

Browse Source 
again. This fixes bug #1928.
* Added license header.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24421 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-03-17 13:11:35 +00:00
parent 6011cc673f
commit 0cbc783bc0
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/disk_device_manager/ddm_userland_interface.cpp
+18 -7
View File
@@ -1,8 +1,16 @@
/** \file ddm_userland_interface.cpp /*
* Copyright 2003-2008, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
* *
* \brief Interface for userspace calls. * Authors:
* Ingo Weinhold, [email protected]
*/ */
/*! \file ddm_userland_interface.cpp
\brief Interface for userspace calls.
*/
#include <stdlib.h> #include <stdlib.h>
#include <AutoDeleter.h> #include <AutoDeleter.h>
@@ -33,8 +41,8 @@ using namespace BPrivate::DiskDevice;
// ddm_strlcpy // ddm_strlcpy
/*! \brief Wrapper around user_strlcpy() that returns a status_t /*! \brief Wrapper around user_strlcpy() that returns a status_t
indicating appropriate success or failure. indicating appropriate success or failure.
\param allowTruncation If \c true, does not return an error if \param allowTruncation If \c true, does not return an error if
\a from is longer than \to. If \c false, returns \c B_NAME_TOO_LONG \a from is longer than \to. If \c false, returns \c B_NAME_TOO_LONG
if \a from is longer than \to. if \a from is longer than \to.
*/ */
@@ -216,7 +224,7 @@ _user_get_next_disk_device_id(int32 *_cookie, size_t *neededSize)
return B_BAD_VALUE; return B_BAD_VALUE;
int32 cookie; int32 cookie;
user_memcpy(&cookie, _cookie, sizeof(cookie)); user_memcpy(&cookie, _cookie, sizeof(cookie));
partition_id id = B_ENTRY_NOT_FOUND; partition_id id = B_ENTRY_NOT_FOUND;
KDiskDeviceManager *manager = KDiskDeviceManager::Default(); KDiskDeviceManager *manager = KDiskDeviceManager::Default();
// get the next device // get the next device
@@ -250,7 +258,7 @@ _user_find_disk_device(const char *_filename, size_t *neededSize)
status_t error = ddm_strlcpy(filename, _filename, B_PATH_NAME_LENGTH); status_t error = ddm_strlcpy(filename, _filename, B_PATH_NAME_LENGTH);
if (error) if (error)
return error; return error;
partition_id id = B_ENTRY_NOT_FOUND; partition_id id = B_ENTRY_NOT_FOUND;
KDiskDeviceManager *manager = KDiskDeviceManager::Default(); KDiskDeviceManager *manager = KDiskDeviceManager::Default();
// find the device // find the device
@@ -425,7 +433,7 @@ status_t
_user_unregister_file_device(partition_id deviceID, const char *_filename) _user_unregister_file_device(partition_id deviceID, const char *_filename)
{ {
if (deviceID < 0 && !_filename) if (deviceID < 0 && !_filename)
return B_BAD_VALUE; return B_BAD_VALUE;
KDiskDeviceManager *manager = KDiskDeviceManager::Default(); KDiskDeviceManager *manager = KDiskDeviceManager::Default();
if (deviceID >= 0) { if (deviceID >= 0) {
return manager->DeleteFileDevice(deviceID); return manager->DeleteFileDevice(deviceID);
@@ -1232,6 +1240,9 @@ _user_uninitialize_partition(partition_id partitionID, int32* _changeCounter)
// uninitialize // uninitialize
error = partition->UninitializeContents(true); error = partition->UninitializeContents(true);
partition->UnmarkBusy(true);
if (error != B_OK) if (error != B_OK)
return error; return error;