From 49fb53ee7e1dae81f0ddd883de1099f5dd2fc628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 2 Apr 2009 16:07:09 +0000 Subject: [PATCH] * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29868 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../disk_device_manager/ddm_userland_interface.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp b/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp index 60410dea19..c76404bc88 100644 --- a/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp +++ b/src/system/kernel/disk_device_manager/ddm_userland_interface.cpp @@ -12,10 +12,11 @@ \brief Interface for userspace calls. */ +#include + #include #include -#include #include #include #include @@ -1282,7 +1283,7 @@ _user_uninitialize_partition(partition_id partitionID, int32* _changeCounter) if (!partition->CheckAndMarkBusy(true)) return B_BUSY; -// TODO: We should also check, if any partition is mounted! + // TODO: We should also check, if any partition is mounted! // uninitialize error = partition->UninitializeContents(true); @@ -1306,7 +1307,6 @@ _user_create_child_partition(partition_id partitionID, int32* _changeCounter, off_t offset, off_t size, const char* _type, const char* _name, const char* _parameters, size_t parametersSize, partition_id* childID, int32* childChangeCounter) - { // copy parameters in UserStringParameter type; @@ -1437,12 +1437,7 @@ _user_delete_child_partition(partition_id partitionID, int32* _changeCounter, return error; // return change counter - if ((error = copy_to_user_value(_changeCounter, partition->ChangeCounter())) - != B_OK) { - return error; - } - - return B_OK; + return copy_to_user_value(_changeCounter, partition->ChangeCounter()); }